Merge branch 'release/1.8.22'

Author: bnu

.htaccess

@@ -1,7 +1,7 @@
 RewriteEngine On
 
 # reserve XE Layout Template Source File (*.html)
-RewriteRule ^(common|layouts|m.layouts)/(.+)\.html$ - [L,F]
+RewriteRule ^(layouts|m.layouts)/(.+)\.html$ - [L,F]
 # reserve XE Template Source Files (*.html)
 RewriteCond %{REQUEST_URI} !/modules/editor/
 RewriteRule /(skins|m.skins)/(.+)\.html$ - [L,F]

.travis.yml

@@ -18,8 +18,8 @@ before_script:
 - phpenv config-rm xdebug.ini
 - if [ $(phpenv version-name) != "5.3" ]; then composer install; fi
 - if [ $(phpenv version-name) != "5.3" ]; then mysql -e 'create database xe_test;'; fi
-- if [ $(phpenv version-name) != "5.3" ]; then echo "USE mysql;\nUPDATE user SET password=PASSWORD('travis')
-  WHERE user='travis';\nFLUSH PRIVILEGES;\n" | mysql -u root; fi
+- if [ $(phpenv version-name) != "5.3" ]; then echo "USE mysql;\nUPDATE user SET password=PASSWORD('root')
+  WHERE user='root';\nFLUSH PRIVILEGES;\n" | mysql -u root; fi
 - if [ $(phpenv version-name) != "5.3" ]; then php -S localhost:8000 & fi
 script:
 - grunt lint

codeception.dist.yml

@@ -7,5 +7,5 @@ paths:
 settings:
     bootstrap: _bootstrap.php
     colors: true
-    memory_limit: 1024M
+    memory_limit: 2048M
     error_level: "E_ALL & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED & ~E_NOTICE"

composer.json

@@ -11,8 +11,6 @@
         "php": ">=5.4.0"
     },
     "require-dev": {
-        "codeception/codeception": "~2.0",
-        "codeception/verify": "0.2.*",
-        "codeception/specify": "0.4.*"
+        "codeception/codeception": "~2.0"
     }
 }

config/config.inc.php

@@ -29,7 +29,7 @@
 /**
  * Display XE's full version.
  */
-define('__XE_VERSION__', '1.8.21');
+define('__XE_VERSION__', '1.8.22');
 define('__XE_VERSION_ALPHA__', (stripos(__XE_VERSION__, 'alpha') !== false));
 define('__XE_VERSION_BETA__', (stripos(__XE_VERSION__, 'beta') !== false));
 define('__XE_VERSION_RC__', (stripos(__XE_VERSION__, 'rc') !== false));

tests/Install.suite.dist.yml

@@ -19,10 +19,10 @@ env:
             config:
                 Db:
                     dsn: 'mysql:host=127.0.0.1;dbname=xe_test'
-                    user: 'travis'
-                    password: 'travis'
+                    user: 'root'
+                    password: 'root'
                     cleanup: true
                 DbDropTablesHelper:
                     dsn: 'mysql:host=127.0.0.1;dbname=xe_test'
-                    user: 'travis'
-                    password: 'travis'
+                    user: 'root'
+                    password: 'root'

tests/unit/_bootstrap.php

@@ -1,3 +1,2 @@
 <?php
 $_SERVER['SCRIPT_NAME'] = '/xe/index.php';
-\Codeception\Specify\Config::setDeepClone(false);

tests/unit/classes/frontendfile/FrontEndFileHandlerTest.php

@@ -1,7 +1,6 @@
 <?php
 require_once _XE_PATH_.'classes/file/FileHandler.class.php';
 require_once _XE_PATH_.'classes/template/TemplateHandler.class.php';
-$_SERVER['SCRIPT_NAME'] = '/xe/tests/unit/classes/template/index.php';
 
 class TemplateHandlerTest extends \Codeception\TestCase\Test
 {