Moved all 3rd party libraries to composer

alexander-torosh · Oct 10, 2015 · 1607cf7 · 1607cf7
1 parent 2ef288c
commit 1607cf7
Show file tree

Hide file tree

Showing 625 changed files with 92,891 additions and 121 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # CHANGELOG
 
-## v0.3.2
+## v0.4
 
 - Updated Semantic UI to version 2.1.4;
 
 - Fixed bug in \Cms\Scanner;
 
+- Moved all 3rd party libraries to **composer.json**;
+
+- Installation process now requires composer;
+
+- Added Phinx library for database migrations;
+
 ## v0.3.1
 
 - Minimized index.php code; Created **YonaCms\Plugin\CheckPoint** plugin for detecting index.php, index.html in Request URI;

diff --git a/README.md b/README.md
@@ -64,12 +64,17 @@ or
 composer install
 ```
 
-### Installing via GitHub
+After updating code, run composer update:
+```
+composer update
+```
 
-Just clone the repository:
+### Permissions
 
 ```
-git clone https://github.com/oleksandr-torosh/yona-cms
+chmod a+w data -R
+chmod a+w web/assets -R
+chmod a+w web/img -R
 ```
 
 [Full installation guide](http://doc.yonacms.com/en/reference/install.html)
@@ -87,7 +92,8 @@ Current version and updates in [CHANGELOG.md](https://github.com/oleksandr-toros
 ##Requirements
 
 * php 5.4+
-* phalcon 1.3.2+
+* phalcon 1.3.4+
+* phalcon 2.0.7+
 * mysql
 * php-intl
 * apache (+mod_rewrite) or nginx
diff --git a/app/Bootstrap.php b/app/Bootstrap.php
@@ -28,6 +28,7 @@ public function run()
         $loader->registerNamespaces($config->loader->namespaces->toArray());
         $loader->registerDirs([APPLICATION_PATH . "/plugins/"]);
         $loader->register();
+        require_once APPLICATION_PATH . '/../vendor/autoload.php';
 
         // Database
         $db = new \Phalcon\Db\Adapter\Pdo\Mysql([
@@ -201,7 +202,7 @@ private function initView($di)
 
         // Volt
         $volt = new \Application\Mvc\View\Engine\Volt($view, $di);
-        $volt->setOptions(['compiledPath' => APPLICATION_PATH . '/cache/volt/']);
+        $volt->setOptions(['compiledPath' => APPLICATION_PATH . '/../data/cache/volt/']);
         $volt->initCompiler();
 
 
@@ -236,7 +237,7 @@ private function initCache($di)
         switch ($config->cache) {
             case 'file':
                 $cache = new \Phalcon\Cache\Backend\File($cacheFrontend, [
-                    "cacheDir" => __DIR__ . "/cache/backend/"
+                    "cacheDir" => APPLICATION_PATH . "/../data/cache/backend/"
                 ]);
                 break;
             case 'memcache':

diff --git a/app/cache/backend/.gitignore b/app/cache/backend/.gitignore
diff --git a/app/cache/volt/.gitignore b/app/cache/volt/.gitignore
diff --git a/app/config/development/application.php → app/config/environment/development.php b/app/config/development/application.php → app/config/environment/development.php
diff --git a/app/config/production/application.php → app/config/environment/production.php b/app/config/production/application.php → app/config/environment/production.php
diff --git a/app/modules/Application/Mvc/Helper/CmsCache.php b/app/modules/Application/Mvc/Helper/CmsCache.php
@@ -12,7 +12,7 @@ class CmsCache extends Component
 
     private static $instance = null;
 
-    const DIR = '/cache/cms/';
+    const DIR = '/../data/cache/cms/';
 
     public static function getInstance()
     {

diff --git a/app/modules/Cms/Config.php b/app/modules/Cms/Config.php
@@ -12,15 +12,14 @@ class Config
     public static function get()
     {
 
-        $application = include_once APPLICATION_PATH . '/config/' . APPLICATION_ENV . '/application.php';
+        $application = include_once APPLICATION_PATH . '/config/environment/' . APPLICATION_ENV . '.php';
 
         $config_default = [
             'loader'    => [
                 'namespaces' => [
                     'YonaCMS\Plugin' => APPLICATION_PATH . '/plugins/',
                     'Application'    => APPLICATION_PATH . '/modules/Application',
                     'Cms'            => APPLICATION_PATH . '/modules/Cms',
-                    'Michelf'        => APPLICATION_PATH . '/../vendor/php-markdown-lib/Michelf',
                 ],
             ],
             'modules'   => [

diff --git a/app/plugins/AdminLocalization.php b/app/plugins/AdminLocalization.php
@@ -15,7 +15,7 @@ class AdminLocalization extends Plugin
 
     public function __construct($config)
     {
-        $file = APPLICATION_PATH . '/translations/admin/' . $config->admin_language . '.php';
+        $file = APPLICATION_PATH . '/../data/translations/admin/' . $config->admin_language . '.php';
         if (!is_file($file)) {
             die("file $file not exists");
         }

diff --git a/app/plugins/MobileDetect.php b/app/plugins/MobileDetect.php
@@ -12,7 +12,6 @@ class MobileDetect
 
     public function __construct($session, $view, $request)
     {
-        require_once APPLICATION_PATH . '/../vendor/Mobile_Detect.php';
         $detect = new \Mobile_Detect();
 
         $mobile = $request->getQuery('mobile');

diff --git a/composer.json b/composer.json
@@ -32,6 +32,10 @@
   "require": {
     "php": ">=5.4",
     "ext-intl": "*",
-    "ext-phalcon": ">=1.3.4"
+    "ext-phalcon": ">=1.3.4",
+    "robmorgan/phinx": "dev-master",
+    "michelf/php-markdown": "*",
+    "mandrill/mandrill": "1.*",
+    "mobiledetect/mobiledetectlib": "^2.8"
   }
 }