refactoring QuickApps core plugin

it's now "CMS"

composer.json

@@ -26,12 +26,12 @@
     },
     "autoload": {
         "psr-4": {
-            "QuickApps\\": "plugins/QuickApps/src"
+            "CMS\\": "plugins/CMS/src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "QuickApps\\Test\\": "tests"
+            "CMS\\Test\\": "tests"
         }
     }
 }

plugins/BackendTheme/src/Aspect/PaginatorHelperAspect.php

@@ -12,10 +12,10 @@
 namespace BackendTheme\Aspect;
 
 use Cake\View\Helper\PaginatorHelper;
+use CMS\Aspect\Aspect;
+use CMS\Core\StaticCacheTrait;
 use Go\Aop\Intercept\MethodInvocation;
 use Go\Lang\Annotation\Before;
-use QuickApps\Aspect\Aspect;
-use QuickApps\Core\StaticCacheTrait;
 
 /**
  * Applies some Twitter Bootstrap CSS styles to Paginator elements.

plugins/Block/src/Controller/AppController.php

@@ -11,7 +11,7 @@
  */
 namespace Block\Controller;
 
-use QuickApps\Controller\Controller;
+use CMS\Controller\Controller;
 
 /**
  * Main controller for Block plugin.

plugins/Block/src/Model/Table/BlocksTable.php

@@ -16,7 +16,7 @@
 use Cake\Event\Event;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;
-use QuickApps\Event\EventDispatcherTrait;
+use CMS\Event\EventDispatcherTrait;
 use \ArrayObject;
 
 /**

plugins/Block/src/Template/Admin/Manage/index.ctp

@@ -10,7 +10,7 @@
  * @license  http://opensource.org/licenses/gpl-3.0.html GPL-3.0 License
  */
 
-use QuickApps\Core\Plugin;
+use CMS\Core\Plugin;
 ?>
 
 <div class="row">

plugins/Block/src/View/Region.php

@@ -17,8 +17,8 @@
 use Cake\I18n\I18n;
 use Cake\ORM\TableRegistry;
 use Cake\Utility\Inflector;
-use QuickApps\Core\StaticCacheTrait;
-use QuickApps\View\View;
+use CMS\Core\StaticCacheTrait;
+use CMS\View\View;
 
 /**
  * Region class.
@@ -54,14 +54,14 @@ class Region
     /**
      * Information about the theme this region belongs to.
      *
-     * @var \QuickApps\Core\Package\PluginPackage
+     * @var \CMS\Core\Package\PluginPackage
      */
     protected $_theme;
 
     /**
      * View instance.
      *
-     * @var \QuickApps\View\View
+     * @var \CMS\View\View
      */
     protected $_View = null;
 
@@ -78,7 +78,7 @@ class Region
      *
      * - `theme`: Name of the theme this regions belongs to. Defaults to auto-detect.
      *
-     * @param \QuickApps\View\View $view Instance of View class to use
+     * @param \CMS\View\View $view Instance of View class to use
      * @param string $name Machine name of the region. e.g.: `left-sidebar`
      * @param array $options Options given as an array
      */
@@ -133,7 +133,7 @@ public function name()
      * $theme = $this->region('left-sidebar')->theme();
      * ```
      *
-     * @return QuickApps\Core\Package\PluginPackage
+     * @return CMS\Core\Package\PluginPackage
      */
     public function theme()
     {
@@ -412,7 +412,7 @@ public function __debugInfo()
             '_blocks' => $this->blocks()->toArray(),
             '_blockLimit' => $this->_blockLimit,
             '_theme' => $this->_theme,
-            '_View' => '(object) \QuickApps\View\View',
+            '_View' => '(object) \CMS\View\View',
         ];
     }
 }

plugins/Block/src/Widget.php

@@ -13,7 +13,7 @@
 
 use Block\Model\Entity\Block;
 use Cake\Validation\Validator;
-use QuickApps\View\View;
+use CMS\View\View;
 
 /**
  * Base class for widget blocks.

plugins/Block/src/Widget/CustomBlockWidget.php

@@ -13,8 +13,8 @@
 
 use Block\Model\Entity\Block;
 use Block\Widget;
-use QuickApps\Core\StaticCacheTrait;
-use QuickApps\View\View;
+use CMS\Core\StaticCacheTrait;
+use CMS\View\View;
 
 /**
  * Shows latest articles.

plugins/Block/tests/TestCase/Controller/Admin/ManageControllerTest.php

@@ -12,7 +12,7 @@
 namespace Block\Test\TestCase\Controller\Admin;
 
 use Cake\ORM\TableRegistry;
-use QuickApps\TestSuite\IntegrationTestCase;
+use CMS\TestSuite\IntegrationTestCase;
 
 /**
  * ManageControllerTest class.

plugins/Block/tests/TestCase/View/RegionTest.php

@@ -15,7 +15,7 @@
 use Block\View\Region;
 use Cake\ORM\Entity;
 use Cake\TestSuite\TestCase;
-use QuickApps\View\View;
+use CMS\View\View;
 
 /**
  * RegionTest class.

plugins/Bootstrap/src/Aspect/FormHelperAspect.php

@@ -12,10 +12,10 @@
 namespace Bootstrap\Aspect;
 
 use Cake\View\Helper\FormHelper;
+use CMS\Aspect\Aspect;
+use CMS\Core\StaticCacheTrait;
 use Go\Aop\Intercept\MethodInvocation;
 use Go\Lang\Annotation\Around;
-use QuickApps\Aspect\Aspect;
-use QuickApps\Core\StaticCacheTrait;
 
 /**
  * Applies some Twitter Bootstrap CSS styles to Form elements.
@@ -68,7 +68,7 @@ class FormHelperAspect extends Aspect
      * Adds custom templates on Form::create().
      *
      * @param \Go\Aop\Intercept\MethodInvocation $invocation Invocation
-     * @Around("execution(public QuickApps\View\Helper\FormHelper->create(*))")
+     * @Around("execution(public CMS\View\Helper\FormHelper->create(*))")
      * @return bool Whether object invocation should proceed or not
      */
     public function alterCreate(MethodInvocation $invocation)
@@ -93,7 +93,7 @@ public function alterCreate(MethodInvocation $invocation)
      * Appends some CSS classes to generic input (text, textarea, select) elements.
      *
      * @param \Go\Aop\Intercept\MethodInvocation $invocation Invocation
-     * @Around("execution(public QuickApps\View\Helper\FormHelper->input(*))")
+     * @Around("execution(public CMS\View\Helper\FormHelper->input(*))")
      * @return bool Whether object invocation should proceed or not
      */
     public function alterInput(MethodInvocation $invocation)
@@ -116,7 +116,7 @@ public function alterInput(MethodInvocation $invocation)
      * Appends some CSS classes to textarea elements.
      *
      * @param \Go\Aop\Intercept\MethodInvocation $invocation Invocation
-     * @Around("execution(public QuickApps\View\Helper\FormHelper->textarea(*))")
+     * @Around("execution(public CMS\View\Helper\FormHelper->textarea(*))")
      * @return bool Whether object invocation should proceed or not
      */
     public function alterTextarea(MethodInvocation $invocation)
@@ -134,7 +134,7 @@ public function alterTextarea(MethodInvocation $invocation)
      * Appends some CSS classes to select elements.
      *
      * @param \Go\Aop\Intercept\MethodInvocation $invocation Invocation
-     * @Around("execution(public QuickApps\View\Helper\FormHelper->select(*))")
+     * @Around("execution(public CMS\View\Helper\FormHelper->select(*))")
      * @return bool Whether object invocation should proceed or not
      */
     public function alteSelectbox(MethodInvocation $invocation)
@@ -151,7 +151,7 @@ public function alteSelectbox(MethodInvocation $invocation)
      * Appends some CSS classes to generic buttons.
      *
      * @param \Go\Aop\Intercept\MethodInvocation $invocation Invocation
-     * @Around("execution(public QuickApps\View\Helper\FormHelper->button(*))")
+     * @Around("execution(public CMS\View\Helper\FormHelper->button(*))")
      * @return bool Whether object invocation should proceed or not
      */
     public function alterButton(MethodInvocation $invocation)
@@ -169,7 +169,7 @@ public function alterButton(MethodInvocation $invocation)
      * Appends some CSS classes to submit buttons.
      *
      * @param \Go\Aop\Intercept\MethodInvocation $invocation Invocation
-     * @Around("execution(public QuickApps\View\Helper\FormHelper->submit(*))")
+     * @Around("execution(public CMS\View\Helper\FormHelper->submit(*))")
      * @return bool Whether object invocation should proceed or not
      */
     public function alterSubmit(MethodInvocation $invocation)

plugins/QuickApps/composer.json → plugins/CMS/composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "quickapps-plugins/QuickApps",
+    "name": "quickapps-plugins/cms",
     "description": "QuickAppsCMS core libraries.",
     "type": "cakephp-plugin",
     "keywords": ["framework", "cms", "cmf", "quickapps", "core"],

plugins/QuickApps/config/app.php → plugins/CMS/config/app.php

@@ -46,7 +46,7 @@
      *   plugins and view templates respectively.
      */
     'App' => [
-        'namespace' => 'QuickApps',
+        'namespace' => 'CMS',
         'encoding' => 'UTF-8',
         'base' => false,
         'dir' => 'src',
@@ -147,7 +147,7 @@
      */
     'Error' => [
         'errorLevel' => E_ALL & ~E_DEPRECATED,
-        'exceptionRenderer' => 'QuickApps\Error\ExceptionRenderer',
+        'exceptionRenderer' => 'CMS\Error\ExceptionRenderer',
         'skipLog' => [],
         'log' => true,
         'trace' => true,

plugins/QuickApps/config/bootstrap.php → plugins/CMS/config/bootstrap.php

@@ -60,9 +60,9 @@
 use Cake\Routing\DispatcherFactory;
 use Cake\Utility\Security;
 use Go\Aop\Features;
-use QuickApps\Aspect\AppAspect;
-use QuickApps\Core\Plugin;
-use QuickApps\Event\EventDispatcher;
+use CMS\Aspect\AppAspect;
+use CMS\Core\Plugin;
+use CMS\Event\EventDispatcher;
 
 /**
  * Configure default event dispatcher to use global event manager.
@@ -72,7 +72,7 @@
 /**
  * Registers custom types.
  */
-Type::map('serialized', 'QuickApps\Database\Type\SerializedType');
+Type::map('serialized', 'CMS\Database\Type\SerializedType');
 
 /**
  * Read configuration file and inject configuration into various

plugins/QuickApps/config/functions.php → plugins/CMS/config/functions.php

@@ -23,7 +23,7 @@
 use Cake\ORM\TableRegistry;
 use Cake\Routing\Router;
 use Cake\Utility\Inflector;
-use QuickApps\Core\Plugin;
+use CMS\Core\Plugin;
 
 if (!function_exists('snapshot')) {
     /**
@@ -159,7 +159,7 @@ function snapshot()
         foreach ($folder->read(false, false, true)[1] as $classFile) {
             $className = basename(preg_replace('/\.php$/', '', $classFile));
             if (!in_array($className, ['AppAspect', 'Aspect'])) {
-                $snapshot['aspects'][] = "QuickApps\\Aspect\\{$className}";
+                $snapshot['aspects'][] = "CMS\\Aspect\\{$className}";
             }
         }
 
@@ -360,9 +360,9 @@ function option($name, $default = false)
      *
      * @param string $plugin Plugin name to get, or null to get a collection of
      *  all plugin objects
-     * @return \QuickApps\Core\Package\PluginPackage|\Cake\Collection\Collection
+     * @return \CMS\Core\Package\PluginPackage|\Cake\Collection\Collection
      * @throws \Cake\Error\FatalErrorException When requested plugin was not found
-     * @see \QuickApps\Core\Plugin::get()
+     * @see \CMS\Core\Plugin::get()
      */
     function plugin($plugin = null)
     {
@@ -386,7 +386,7 @@ function plugin($plugin = null)
      *
      * @param string|null $name Name of the theme to get, or null to get the theme
      *  being used in current request
-     * @return \QuickApps\Core\Package\PluginPackage
+     * @return \CMS\Core\Package\PluginPackage
      * @throws \Cake\Error\FatalErrorException When theme could not be found
      */
     function theme($name = null)

plugins/QuickApps/config/routes.php → plugins/CMS/config/routes.php

@@ -9,11 +9,11 @@
  * @link     http://www.quickappscms.org
  * @license  http://opensource.org/licenses/gpl-3.0.html GPL-3.0 License
  */
-namespace QuickApps\Config;
+namespace CMS\Config;
 
 use Cake\I18n\I18n;
 use Cake\Routing\Router;
-use QuickApps\Core\Plugin;
+use CMS\Core\Plugin;
 
 if (!is_readable(SITE_ROOT . '/config/settings.php')) {
     /**

plugins/QuickApps/src/Aspect/AppAspect.php → plugins/CMS/src/Aspect/AppAspect.php

@@ -9,11 +9,11 @@
  * @link     http://www.quickappscms.org
  * @license  http://opensource.org/licenses/gpl-3.0.html GPL-3.0 License
  */
-namespace QuickApps\Aspect;
+namespace CMS\Aspect;
 
+use CMS\Aspect\Aspect;
 use Go\Core\AspectContainer;
 use Go\Core\AspectKernel;
-use QuickApps\Aspect\Aspect;
 
 /**
  * QuickApps Application Aspect Kernel.

plugins/QuickApps/src/Aspect/Aspect.php → plugins/CMS/src/Aspect/Aspect.php

@@ -9,7 +9,7 @@
  * @link     http://www.quickappscms.org
  * @license  http://opensource.org/licenses/gpl-3.0.html GPL-3.0 License
  */
-namespace QuickApps\Aspect;
+namespace CMS\Aspect;
 
 use Go\Aop\Aspect as GoAspect;
 

plugins/QuickApps/src/Aspect/FormHelperAspect.php → plugins/CMS/src/Aspect/FormHelperAspect.php

@@ -9,12 +9,12 @@
  * @link     http://www.quickappscms.org
  * @license  http://opensource.org/licenses/gpl-3.0.html GPL-3.0 License
  */
-namespace QuickApps\Aspect;
+namespace CMS\Aspect;
 
+use CMS\Aspect\Aspect;
+use CMS\View\Helper\FormHelper;
 use Go\Aop\Intercept\MethodInvocation;
 use Go\Lang\Annotation\Around;
-use QuickApps\Aspect\Aspect;
-use QuickApps\View\Helper\FormHelper;
 
 /**
  * Intercepts FormHelper methods to add name prefixes.
@@ -26,7 +26,7 @@ class FormHelperAspect extends Aspect
      * Adds prefix to every input element that may have a "name" attribute.
      *
      * @param \Go\Aop\Intercept\MethodInvocation $invocation Invocation
-     * @Around("execution(public QuickApps\View\Helper\FormHelper->label|input|checkbox|radio|textarea|hidden|file|select|multiCheckbox|day|year|month|hour|minute|meridian|dateTime|time|date(*))")
+     * @Around("execution(public CMS\View\Helper\FormHelper->label|input|checkbox|radio|textarea|hidden|file|select|multiCheckbox|day|year|month|hour|minute|meridian|dateTime|time|date(*))")
      * @return bool Whether object invocation should proceed or not
      */
     public function addInputPrefix(MethodInvocation $invocation)
@@ -46,7 +46,7 @@ public function addInputPrefix(MethodInvocation $invocation)
     /**
      * Add prefix to field name if a prefix was set using FormHelper::prefix().
      *
-     * @param \QuickApps\View\Helper\FormHelper $helper Field helper instance
+     * @param \CMS\View\Helper\FormHelper $helper Field helper instance
      * @param string $name Field name
      * @return string Prefixed field name
      */

plugins/QuickApps/src/Console/WebConsoleInput.php → plugins/CMS/src/Console/WebConsoleInput.php

@@ -9,7 +9,7 @@
  * @link     http://www.quickappscms.org
  * @license  http://opensource.org/licenses/gpl-3.0.html GPL-3.0 License
  */
-namespace QuickApps\Console;
+namespace CMS\Console;
 
 use Cake\Console\ConsoleInput;
 use Cake\Routing\Router;

plugins/QuickApps/src/Console/WebConsoleOutput.php → plugins/CMS/src/Console/WebConsoleOutput.php

@@ -9,7 +9,7 @@
  * @link     http://www.quickappscms.org
  * @license  http://opensource.org/licenses/gpl-3.0.html GPL-3.0 License
  */
-namespace QuickApps\Console;
+namespace CMS\Console;
 
 use Cake\Console\ConsoleOutput;