Merge pull request #1550 from elcreator/fix-8.4-deprecations

Fix 8.4 deprecations

Author: Jeckerson

src/Access/Manager.php

@@ -50,7 +50,7 @@ public function __construct(PolicyInterface $policy)
      *
      * @return mixed
      */
-    public function beforeDispatch(Event $event, Dispatcher $dispatcher, array $data = null)
+    public function beforeDispatch(Event $event, Dispatcher $dispatcher, ?array $data = null)
     {
         $controller = $dispatcher->getControllerName();
 
@@ -75,7 +75,7 @@ public function beforeDispatch(Event $event, Dispatcher $dispatcher, array $data
      * @param array $data Data. [Optional]
      * @return bool
      */
-    public function isAllowedAccess(string $resourceName, array $data = null): bool
+    public function isAllowedAccess(string $resourceName, ?array $data = null): bool
     {
         return $resourceName == 'error' || $this->policy->isAllowedAccess($resourceName, $data);
     }

src/Access/Policy/Ip.php

@@ -45,7 +45,7 @@ public function __construct(string $ip)
      * @param array $data Data. [Optional]
      * @return bool
      */
-    public function isAllowedAccess(string $resourceName, array $data = null): bool
+    public function isAllowedAccess(string $resourceName, ?array $data = null): bool
     {
         $ip = $this->request->getClientAddress();
 

src/Access/PolicyInterface.php

@@ -21,5 +21,5 @@ interface PolicyInterface
      * @param array $data Data. [Optional]
      * @return bool
      */
-    public function isAllowedAccess(string $resourceName, array $data = null): bool;
+    public function isAllowedAccess(string $resourceName, ?array $data = null): bool;
 }

src/Builder/Component/Scaffold.php

@@ -239,7 +239,7 @@ public function build(): bool
      *
      * @return string
      */
-    private function captureFilterInput(string $var, $fields, bool $useGetSetters, string $identityField = null): string
+    private function captureFilterInput(string $var, $fields, bool $useGetSetters, ?string $identityField = null): string
     {
         $code = '';
         foreach ($fields as $field => $dataType) {

src/Builder/Path.php

@@ -25,7 +25,7 @@ class Path
      */
     protected $rootPath = null;
 
-    public function __construct(string $rootPath = null)
+    public function __construct(?string $rootPath = null)
     {
         $this->rootPath = $rootPath ?: realpath('.') . DIRECTORY_SEPARATOR;
     }

src/Generator/Snippet.php

@@ -281,7 +281,7 @@ public static function findFirst(\$parameters = null): ?\Phalcon\Mvc\ModelInterf
      * @param  array  $options
      * @return string PHP syntax
      */
-    public function getRelationOptions(array $options = null)
+    public function getRelationOptions(?array $options = null)
     {
         if (empty($options)) {
             return 'NULL';

templates/module/Module.php

@@ -18,7 +18,7 @@ class Module implements ModuleDefinitionInterface
      *
      * @param DiInterface $di
      */
-    public function registerAutoloaders(DiInterface $di = null)
+    public function registerAutoloaders(?DiInterface $di = null)
     {
         $loader = new Loader();
 
@@ -41,9 +41,9 @@ public function registerServices(DiInterface $di)
          * Try to load local configuration
          */
         if (file_exists(@@configName@@)) {
-            
+
             $config = $di['config'];
-            
+
             $override = @@configLoader@@;
 
             if ($config instanceof Config) {
@@ -61,7 +61,7 @@ public function registerServices(DiInterface $di)
 
             $view = new View();
             $view->setViewsDir($config->get('application')->viewsDir);
-            
+
             $view->registerEngines([
                 '.volt'  => 'voltShared',
                 '.phtml' => PhpEngine::class

templates/project/modules/Module_cli.php

@@ -14,7 +14,7 @@ class Module implements ModuleDefinitionInterface
      *
      * @param DiInterface $di
      */
-    public function registerAutoloaders(DiInterface $di = null)
+    public function registerAutoloaders(?DiInterface $di = null)
     {
         $loader = new Loader();
 

templates/project/modules/Module_web.php

@@ -16,7 +16,7 @@ class Module implements ModuleDefinitionInterface
      *
      * @param DiInterface $di
      */
-    public function registerAutoloaders(DiInterface $di = null)
+    public function registerAutoloaders(?DiInterface $di = null)
     {
         $loader = new Loader();