Merge branch '0.4.1'

Conflicts:
	README.md

Author: lantian

CHANGELOG.txt

@@ -1,3 +1,25 @@
+Version 0.4.1
+ - Added more flexible manifest.json support for packages, thanks to @WooDzu.
+ - Fixed #30, thanks to @WooDzu.
+ - Cache clearing optimizations, added "Clear cache" button to dashboard, thanks to @WooDzu.
+ - Fixed minor problems with cache path detection.
+ - Added method "php" to view. Allows to use php code inside volt.
+ - Header widget: do not display logo if empty.
+ - Fixed escaping in CkEditor form element.
+ - Helper "Security" renamed to "Acl".
+ - Console commands: fixed command description output.
+ - Removed ACL wrapper, for performance reason.
+ - Helpers implementation was reworked.
+ - Added languages cache location to config.
+ - Removed call_user_func_array where it is possible.
+ - Fixed bug with cacheDir that can be missing in config.
+ - Reworked cache adapters creation.
+ - Added strtolower method to dispatcher for action (this is for Phalcon 1.3.2).
+ - Fixed possible error with form validation message (Phalcon 1.3.2).
+ - Added caching mechanism for assets generation tool.
+ - Fixed bugs: #64, #49, #67, #26.
+ - Implemented: #55.
+
 Version 0.4.0
  - Implemented isCached, getCacheKey, getCacheLifeTime, clearCache methods for widgets caching.
  - Implemented modules system.

README.md

@@ -3,7 +3,7 @@ Phalcon Eye CMS
 
 Phalcon Eye - CMS based on Phalcon PHP Framework (https://github.com/phalcon/cphalcon).
 
-* Version: 0.4.0
+* Version: 0.4.1
 * Requirements: PHP >= 5.4, Phalcon = 1.3.0, mod_rewrite, zlib, mbstring, mcrypt, iconv, gd, fileinfo, zip
 * Website: http://phalconeye.com/
 
@@ -21,7 +21,15 @@ Installation
 
 Note: If you want to reinstall, set option 'installed' to 'false' in /app/var/data/app.php.
 
-Coding Style [![Build Status](https://secure.travis-ci.org/PhalconEye/cms.png?branch=master)](https://travis-ci.org/PhalconEye/cms)
+Contribution
+------------
+Feel free to contribute.
+
+* Found a bug? Try to find it in issue tracker https://github.com/PhalconEye/cms/issues ... If this bug is missing - you can add an issue about it.
+* Want to discuss? Visit http://forum.phalconeye.com/ and create topic that is interesting for you.
+* Can/want/like develop? Create pull request and we will check it in nearest time! Just don't forget to check code styling (you can run it via command "ant check") and please don't miss file and class headers (also add yourself as an author if you have changed something).
+
+Coding Style [![Build Status](https://secure.travis-ci.org/PhalconEye/cms.png?branch=master)](http://travis-ci.org/PhalconEye/cms)
 ------------
 PhalconEye CMS code style is checked via Travis CI service. Every commit pushed to this repository will queue a build
 into the continuous integration service to run phpmd and phpcs checks.

app/config/development/application.php.dist

@@ -26,44 +26,49 @@ return array (
   'debug' => true,
   'profiler' => true,
   'baseUrl' => '/',
-  'cache' => 
+  'cache' =>
   array (
     'lifetime' => '86400',
     'prefix' => 'pe_',
     'adapter' => 'File',
     'cacheDir' => ROOT_PATH . '/app/var/cache/data/',
   ),
-  'logger' => 
+  'logger' =>
   array (
     'enabled' => true,
     'path' => ROOT_PATH . '/app/var/logs/',
     'format' => '[%date%][%type%] %message%',
   ),
-  'view' => 
+  'view' =>
   array (
     'compiledPath' => ROOT_PATH . '/app/var/cache/view/',
     'compiledExtension' => '.php',
     'compiledSeparator' => '_',
     'compileAlways' => true,
   ),
-  'session' => 
+  'session' =>
   array (
     'adapter' => 'Files',
     'uniqueId' => 'PhalconEye_',
   ),
-  'assets' => 
+  'assets' =>
   array (
     'local' => 'assets/',
     'remote' => false,
+    'lifetime' => 0,
   ),
-  'metadata' => 
+  'metadata' =>
   array (
     'adapter' => 'Files',
     'metaDataDir' => ROOT_PATH . '/app/var/cache/metadata/',
   ),
-  'annotations' => 
+  'annotations' =>
   array (
     'adapter' => 'Files',
     'annotationsDir' => ROOT_PATH . '/app/var/cache/annotations/',
   ),
+  'languages' =>
+  array(
+    'cacheDir' => ROOT_PATH . '/app/var/cache/languages/',
+  ),
 );

app/config/production/application.php.dist

@@ -55,6 +55,7 @@ return array (
   array (
     'local' => 'assets/',
     'remote' => false,
+    'lifetime' => 0,
   ),
   'metadata' => 
   array (
@@ -66,4 +67,8 @@ return array (
     'adapter' => 'Files',
     'annotationsDir' => ROOT_PATH . '/app/var/cache/annotations/',
   ),
+  'languages' =>
+  array(
+    'cacheDir' => ROOT_PATH . '/app/var/cache/languages/',
+  ),
 );

app/engine/Application.php

@@ -208,31 +208,13 @@ public function getOutput()
      */
     public function clearCache($themeDirectory = '')
     {
-        $viewCache = $this->_dependencyInjector->get('viewCache');
         $cacheOutput = $this->_dependencyInjector->get('cacheOutput');
         $cacheData = $this->_dependencyInjector->get('cacheData');
-        $modelsCache = $this->_dependencyInjector->get('modelsCache');
         $config = $this->_dependencyInjector->get('config');
 
-        $keys = $viewCache->queryKeys();
-        foreach ($keys as $key) {
-            $viewCache->delete($key);
-        }
-
-        $keys = $cacheOutput->queryKeys();
-        foreach ($keys as $key) {
-            $cacheOutput->delete($key);
-        }
+        $cacheOutput->flush();
+        $cacheData->flush();
 
-        $keys = $cacheData->queryKeys();
-        foreach ($keys as $key) {
-            $cacheData->delete($key);
-        }
-
-        $keys = $modelsCache->queryKeys();
-        foreach ($keys as $key) {
-            $modelsCache->delete($key);
-        }
 
         // Files deleter helper.
         $deleteFiles = function ($files) {
@@ -244,7 +226,9 @@ public function clearCache($themeDirectory = '')
         };
 
         // Clear files cache.
-        $deleteFiles(glob($config->application->cache->cacheDir . '*'));
+        if (isset($config->application->cache->cacheDir)) {
+            $deleteFiles(glob($config->application->cache->cacheDir . '*'));
+        }
 
         // Clear view cache.
         $deleteFiles(glob($config->application->view->compiledPath . '*'));

app/engine/ApplicationInitialization.php

@@ -444,26 +444,13 @@ protected function _initCache($di, $config)
             $frontOutputCache = new CacheOutput($frontEndOptions);
             $frontDataCache = new CacheData($frontEndOptions);
 
-            // Cache:View.
-            $di->set(
-                'viewCache',
-                function () use ($cacheAdapter, $frontOutputCache, $backEndOptions) {
-                    return new $cacheAdapter($frontOutputCache, $backEndOptions);
-                }
-            );
-
-            // Cache:Output.
-            $cacheOutput = new $cacheAdapter($frontOutputCache, $backEndOptions);
-            $di->set('cacheOutput', $cacheOutput, true);
-
-            // Cache:Data.
-            $cacheData = new $cacheAdapter($frontDataCache, $backEndOptions);
-            $di->set('cacheData', $cacheData, true);
-
-            // Cache:Models.
-            $cacheModels = new $cacheAdapter($frontDataCache, $backEndOptions);
-            $di->set('modelsCache', $cacheModels, true);
+            $cacheOutputAdapter = new $cacheAdapter($frontOutputCache, $backEndOptions);
+            $di->set('viewCache', $cacheOutputAdapter, true);
+            $di->set('cacheOutput', $cacheOutputAdapter, true);
 
+            $cacheDataAdapter = new $cacheAdapter($frontDataCache, $backEndOptions);
+            $di->set('cacheData', $cacheDataAdapter, true);
+            $di->set('modelsCache', $cacheDataAdapter, true);
         } else {
             // Create a dummy cache for system.
             // System will work correctly and the data will be always current for all adapters.