Merge pull request #1489 from phalcon/4.0.x

4.0.5

Author: Jeckerson

.github/ISSUE_TEMPLATE.md

@@ -1,4 +1,4 @@
-> Questions should go to https://forum.phalconphp.com
+> Questions should go to https://forum.phalcon.io
 > Documentation issues should go to https://github.com/phalcon/docs/issues
 
 ### Expected and Actual Behavior
@@ -23,5 +23,4 @@
 * PHP Version: (`php -v`)
 * Operating System:
 * Server: Nginx | Apache | Other
-* Other related info (Database, table schema): 
-
+* Other related info (Database, table schema):

CHANGELOG.md

@@ -1,3 +1,9 @@
+# [4.0.5](https://github.com/phalcon/cphalcon/releases/tag/v4.0.5) (2021-03-14)
+## Fixed
+- Fixed model creation failure in webtools due to wrong variable mutation [#1415](https://github.com/phalcon/phalcon-devtools/issues/1415)
+- Fixed config path detection to platform independent [#1426](https://github.com/phalcon/phalcon-devtools/issues/1426)
+
+
 # [4.0.4](https://github.com/phalcon/cphalcon/releases/tag/v4.0.4) (2021-03-11)
 ## Added
 - Added support for PHP `7.4` [#1482](https://github.com/phalcon/phalcon-devtools/pull/1482)

bootstrap/autoload.php

@@ -14,7 +14,7 @@
 if (!extension_loaded('phalcon')) {
     throw new Exception(
         "Phalcon extension isn't installed, follow these instructions to install it: " .
-        'https://docs.phalconphp.com/en/latest/installation'
+        'https://docs.phalcon.io/en/latest/installation'
     );
 }
 
@@ -87,11 +87,6 @@
  */
 defined('HOSTNAME') || define('HOSTNAME', explode('.', gethostname())[0]);
 
-/**
- * @const ADMIN_LTE_VERSION The AdminLTE version.
- */
-defined('ADMIN_LTE_VERSION') || define('ADMIN_LTE_VERSION', '2.3.6');
-
 /**
  * Register the Composer autoloader (if any)
  */

composer.json

@@ -52,9 +52,11 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Phalcon\\Test\\": "tests/unit",
-            "Phalcon\\Test\\Models\\": "tests/_data/models",
-            "Phalcon\\Test\\Module\\": "tests/_support/Module"
+            "Phalcon\\DevTools\\Tests\\Acceptance\\": "tests/acceptance/",
+            "Phalcon\\DevTools\\Tests\\Console\\": "tests/console/",
+            "Phalcon\\DevTools\\Tests\\Functional\\": "tests/functional/",
+            "Phalcon\\DevTools\\Tests\\Unit\\": "tests/unit/",
+            "Phalcon\\DevTools\\Tests\\Support\\Module\\": "tests/_support/Module"
         },
         "files": [
             "tests/_support/helpers.php"

composer.lock

@@ -110,7 +110,7 @@ check_install(){
 			printf "\n"
 			printf "\nIn case of problems: "
 			printf "${YELLOW}https://github.com/phalcon/phalcon-devtools/issues${NC} "
-			printf "\n                and: ${YELLOW}https://forum.phalconphp.com${NC}"
+			printf "\n                and: ${YELLOW}https://forum.phalcon.io${NC}"
 			printf "\n"
 
 			check_bash

phalcon.sh

@@ -139,9 +139,7 @@ public function build(): void
 
         $adapterName = 'Phalcon\Db\Adapter\Pdo\\' . $adapter;
         unset($configArray['adapter']);
-        if (isset($configArray['options'])) {
-            $configArray = $configArray['options'];
-        }
+
         /** @var AbstractPdo $db */
         $db = new $adapterName($configArray);
 

src/Builder/Component/Model.php

@@ -43,34 +43,32 @@ public function getConfig($type = null): Config
         $type  = isset($types[$type]) ? $type : 'ini';
 
         foreach (['app/config/', 'config/', 'apps/config/', 'apps/frontend/config/'] as $configPath) {
-            if ('ini' == $type && file_exists($this->rootPath . $configPath . 'config.ini')) {
+            if ('ini' === $type && file_exists($this->rootPath . $configPath . 'config.ini')) {
                 return new ConfigIni($this->rootPath . $configPath . 'config.ini');
-            } else {
-                if (file_exists($this->rootPath . $configPath. 'config.php')) {
-                    $config = include($this->rootPath . $configPath . 'config.php');
-                    if (is_array($config)) {
-                        $config = new Config($config);
-                    }
-
-                    return $config;
+            }
+            if (file_exists($this->rootPath . $configPath. 'config.php')) {
+                $config = include($this->rootPath . $configPath . 'config.php');
+                if (is_array($config)) {
+                    $config = new Config($config);
                 }
+
+                return $config;
             }
         }
 
         $directory = new RecursiveDirectoryIterator('.');
         $iterator = new RecursiveIteratorIterator($directory);
         foreach ($iterator as $f) {
-            if (preg_match('/\/config\.php$/i', $f->getPathName())) {
+            if (false !== strpos($f->getPathName(), 'config.php')) {
                 $config = include $f->getPathName();
                 if (is_array($config)) {
                     $config = new Config($config);
                 }
 
                 return $config;
-            } else {
-                if (preg_match('/config\.ini$/i', $f->getPathName())) {
-                    return new ConfigIni($f->getPathName());
-                }
+            }
+            if (false !== strpos($f->getPathName(), 'config.ini')) {
+                return new ConfigIni($f->getPathName());
             }
         }
 

src/Builder/Path.php

@@ -30,11 +30,9 @@ class OptionsAware implements FactoryOptions
     /**
      * @param array $options
      */
-    public function __construct(array $options = null)
+    public function __construct(array $options = [])
     {
-        if (!empty($options)) {
-            $this->options = $options;
-        }
+        $this->options = $options;
     }
 
     /**
@@ -110,7 +108,7 @@ public function getOptions(): array
     public function getOption($key)
     {
         if (!isset($this->options[$key])) {
-            throw new InvalidArgumentException("Option " . $key . " has't been defined");
+            throw new InvalidArgumentException("Option " . $key . " hasn't been defined");
         }
 
         return $this->options[$key];

src/Options/OptionsAware.php

@@ -31,7 +31,7 @@ class AnnotationsProvider implements ServiceProviderInterface
     public function register(DiInterface $di): void
     {
         $di->setShared($this->providerName, function () {
-            return new AnnotationsMemory;
+            return new AnnotationsMemory();
         });
     }
 }