Merge pull request #1359 from phalcon/v4-bug-fixes

V4 Bug Fixes

Author: Jeckerson

src/Bootstrap.php

@@ -182,8 +182,9 @@ public function __construct(array $parameters = [])
         $this->initFromConstants();
         $this->setParameters($parameters);
 
-        $this->di  = new FactoryDefault;
         $this->app = new MvcApplication;
+        $this->di = new FactoryDefault;
+        $this->di->setShared('application', $this);
 
         (new ErrorHandler)->register();
 
@@ -194,8 +195,6 @@ public function __construct(array $parameters = [])
         }
 
         $this->app->setEventsManager($this->di->getShared('eventsManager'));
-
-        $this->di->setShared('application', $this->app);
         $this->app->setDI($this->di);
 
         Di::setDefault($this->di);

src/Providers/AccessManagerProvider.php

@@ -31,7 +31,7 @@ class AccessManagerProvider implements ServiceProviderInterface
      */
     public function register(DiInterface $di): void
     {
-        $ptoolsIp = $di->getShared('application')->ptoolsIp;
+        $ptoolsIp = $di->getShared('application')->getPtoolsIp();
 
         $di->setShared($this->providerName, function () use ($ptoolsIp) {
             $policy = new IpPolicy($ptoolsIp);

src/Providers/ConfigProvider.php

@@ -31,7 +31,7 @@ class ConfigProvider implements ServiceProviderInterface
      */
     public function register(DiInterface $di): void
     {
-        $basePath = $di->getShared('application')->basePath;
+        $basePath = $di->getShared('application')->getBasePath();
         $di->setShared($this->providerName, function () use ($basePath) {
             $scanner = new ConfigScanner($basePath);
             $config = $scanner->load('config');

src/Providers/LoggerProvider.php

@@ -34,8 +34,8 @@ class LoggerProvider implements ServiceProviderInterface
     public function register(DiInterface $di): void
     {
         $application = $di->getShared('application');
-        $hostName = $application->hostName;
-        $basePath = $application->basePath;
+        $hostName = $application->getHostName();
+        $basePath = $application->getBasePath();
 
         $di->setShared($this->providerName, function () use ($hostName, $basePath) {
             $ptoolsPath = $basePath . DS . '.phalcon' . DS;

src/Providers/RouterProvider.php

@@ -39,6 +39,7 @@ public function register(DiInterface $di): void
 
             $router = new AnnotationsRouter(false);
             $router->removeExtraSlashes(true);
+            $router->notFound(['controller' => 'error', 'action' => 'route404']);
             $router->setDefaultAction('index');
             $router->setDefaultController('index');
             $router->setDefaultNamespace('Phalcon\DevTools\Web\Tools\Controllers');
@@ -63,7 +64,6 @@ public function register(DiInterface $di): void
             }
 
             $router->setEventsManager($em);
-            $router->notFound(['controller' => 'error', 'action' => 'route404']);
 
             return $router;
         });

src/Providers/VoltProvider.php

@@ -38,8 +38,8 @@ class VoltProvider implements ServiceProviderInterface
     public function register(DiInterface $di): void
     {
         $this->di = $di;
-        $basePath = $di->getShared('application')->basePath;
-        $ptoolsPath = $di->getShared('application')->ptoolsPath;
+        $basePath = $di->getShared('application')->getBasePath();
+        $ptoolsPath = $di->getShared('application')->getPtoolsPath();
         $that = $this;
 
         $di->setShared($this->providerName, function ($view, $di) use ($basePath, $ptoolsPath, $that) {