Merge pull request #1702 from spryker/feature/te-751/master-enabling-…

…step-3

TE-751 Remove Silex Enabling step 3

composer.json

@@ -19,7 +19,6 @@
     "mandrill/mandrill": "~1.0.55",
     "monolog/monolog": "^1.21.0",
     "nesbot/carbon": "~1.13.0",
-    "pimple/pimple": "~1.1.1",
     "predis/predis": "^1.1.1",
     "propel/propel": "2.0.0-alpha8",
     "psr/log": "^1.0.0",
@@ -45,7 +44,7 @@
     "symfony/validator": "^2.6.13 || ^3.0.0",
     "symfony/yaml": "^2.6.13 || ^3.0.0",
     "swiftmailer/swiftmailer": "^6.1",
-    "twig/twig": "^1.30.0",
+    "twig/twig": "^1.36.0",
     "zendframework/zend-config": "^3.1.0",
     "zendframework/zend-filter": "^2.5.1",
     "zendframework/zend-servicemanager": "^3.3",
@@ -100,6 +99,9 @@
       "PyzTest\\": "tests/PyzTest/",
       "PhpStan\\": "tests/PhpStan/"
     },
+    "psr-0": {
+      "Pimple": "vendor/spryker/spryker/Bundles/Container/src/Spryker"
+    },
     "files": [
       "test-autoload.php"
     ]
@@ -121,6 +123,10 @@
     {
       "type": "git",
       "url": "[email protected]:spryker/spryk.git"
+    },
+    {
+      "type": "git",
+      "url": "[email protected]:spryker/silexphp.git"
     }
   ],
   "scripts": {

src/Pyz/Yves/Application/ApplicationDependencyProvider.php

@@ -8,11 +8,11 @@
 namespace Pyz\Yves\Application;
 
 use Pyz\Yves\Twig\Plugin\TwigYves;
-use Spryker\Yves\Kernel\AbstractBundleDependencyProvider;
+use Spryker\Yves\Application\ApplicationDependencyProvider as SprykerApplicationDependencyProvider;
 use Spryker\Yves\Kernel\Container;
 use Spryker\Yves\Kernel\Plugin\Pimple;
 
-class ApplicationDependencyProvider extends AbstractBundleDependencyProvider
+class ApplicationDependencyProvider extends SprykerApplicationDependencyProvider
 {
     public const SERVICE_UTIL_DATE_TIME = 'util date time service';
 
@@ -34,6 +34,7 @@ class ApplicationDependencyProvider extends AbstractBundleDependencyProvider
      */
     public function provideDependencies(Container $container)
     {
+        $container = parent::provideDependencies($container);
         $container = $this->provideClients($container);
         $container = $this->providePlugins($container);
         $container = $this->addUtilDateTimeService($container);

src/Pyz/Yves/Application/YvesBootstrap.php

@@ -52,9 +52,9 @@
 use Spryker\Yves\Application\Plugin\ServiceProvider\AssertUrlConfigurationServiceProvider;
 use Spryker\Yves\Application\Plugin\ServiceProvider\KernelLogServiceProvider;
 use Spryker\Yves\Application\Plugin\ServiceProvider\SslServiceProvider;
+use Spryker\Yves\Application\YvesBootstrap as SprykerYvesBootstrap;
 use Spryker\Yves\CmsContentWidget\Plugin\CmsContentWidgetServiceProvider;
 use Spryker\Yves\Currency\Plugin\CurrencySwitcherServiceProvider;
-use Spryker\Yves\Kernel\Application;
 use Spryker\Yves\Messenger\Plugin\Provider\FlashMessengerServiceProvider;
 use Spryker\Yves\Money\Plugin\ServiceProvider\TwigMoneyServiceProvider;
 use Spryker\Yves\Monitoring\Plugin\ServiceProvider\MonitoringRequestTransactionServiceProvider;
@@ -71,36 +71,8 @@
 use Spryker\Yves\ZedRequest\Plugin\ServiceProvider\ZedRequestHeaderServiceProvider;
 use Spryker\Yves\ZedRequest\Plugin\ServiceProvider\ZedRequestLogServiceProvider;
 
-class YvesBootstrap
+class YvesBootstrap extends SprykerYvesBootstrap
 {
-    /**
-     * @var \Spryker\Yves\Kernel\Application
-     */
-    protected $application;
-
-    /**
-     * @var \Pyz\Yves\Application\ApplicationConfig
-     */
-    protected $config;
-
-    public function __construct()
-    {
-        $this->application = new Application();
-        $this->config = new ApplicationConfig();
-    }
-
-    /**
-     * @return \Spryker\Yves\Kernel\Application
-     */
-    public function boot()
-    {
-        $this->registerServiceProviders();
-        $this->registerRouters();
-        $this->registerControllerProviders();
-
-        return $this->application;
-    }
-
     /**
      * @return void
      */

src/Pyz/Zed/Application/ApplicationDependencyProvider.php

@@ -67,6 +67,8 @@ class ApplicationDependencyProvider extends SprykerApplicationDependencyProvider
      */
     public function provideCommunicationLayerDependencies(Container $container)
     {
+        $container = parent::provideCommunicationLayerDependencies($container);
+
         $container[self::SERVICE_PROVIDER] = function (Container $container) {
             return $this->getServiceProviders($container);
         };