Use composer to manage CakePHP dependency, update CakePHP to 2.10.*

.gitignore

@@ -9,6 +9,7 @@
 /lib/Cake/Console/Templates/skel/tmp/
 /plugins
 /vendors
+/Vendor
 /build
 /dist
 /tags

app/Console/cake.php

@@ -17,15 +17,26 @@
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
 
-$ds = DIRECTORY_SEPARATOR;
-$dispatcher = 'Cake' . $ds . 'Console' . $ds . 'ShellDispatcher.php';
+if (!defined('DS')) {
+    define('DS', DIRECTORY_SEPARATOR);
+}
+
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
+    $appDir = basename(dirname(dirname(__FILE__)));
+    $install = $root . DS . 'lib';
+    $composerInstall = $root . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+
+    if (file_exists($composerInstall . DS . $dispatcher)) {
+        $install = $composerInstall;
+    }
 
 	// the following line differs from its sibling
 	// /lib/Cake/Console/Templates/skel/Console/cake.php
-	ini_set('include_path', $root . $ds . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+    ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
+	unset($root, $appDir, $install, $composerInstall);
 }
 
 if (!include $dispatcher) {

app/webroot/index.php

@@ -61,7 +61,7 @@
  * The following line differs from its sibling
  * /lib/Cake/Console/Templates/skel/webroot/index.php
  */
-//define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib');
 
 /**
  * Editing below this line should NOT be necessary.

composer.json

@@ -0,0 +1,20 @@
+{
+  "name": "sonerezh/sonerezh",
+  "description": "A self-hosted, web-based application to stream your music, everywhere.",
+  "type": "project",
+  "require": {
+    "cakephp/cakephp": "2.10.*",
+    "ext-gd": "*"
+  },
+  "license": "AGPL-3.0-or-later",
+  "authors": [
+    {
+      "name": "Sonerezh",
+      "email": "[email protected]"
+    }
+  ],
+  "minimum-stability": "stable",
+  "config": {
+    "vendor-dir": "Vendor/"
+  }
+}