Merge pull request #14 from dereuromark/master

CakePHP CS
uzyn · Jan 6, 2014 · 5bc4d29 · 5bc4d29
2 parents b4a0d07 + 28695f9
commit 5bc4d29
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Config/bootstrap.php b/Config/bootstrap.php
@@ -1,4 +1,4 @@
 <?php
-if (file_exists(APP.'Vendor'.DS.'autoload.php')) {
+if (file_exists(APP . 'Vendor' . DS . 'autoload.php')) {
 	App::import('Vendor', 'autoload');
 }
diff --git a/Console/Command/ComposerShell.php b/Console/Command/ComposerShell.php
@@ -25,7 +25,7 @@ public function initialize() {
 			if (Configure::read('Composer.phar_dir') !== null) {
 				$this->pharDir = Configure::read('Composer.phar_dir');
 			} else {
-				$this->pharDir = dirname(dirname(dirname(__FILE__))).DS.'Vendor'.DS.'Composer'.DS;
+				$this->pharDir = dirname(dirname(dirname(__FILE__))) . DS . 'Vendor' . DS . 'Composer' . DS;
 			}
 		}
 	}
@@ -170,7 +170,7 @@ protected function _checkComposerPhar() {
 		$version = $this->_getComposerVersion();
 
 		if (stripos($version, 'Composer') === false || stripos($version, 'version') === false) {
-			if(file_exists("{$this->pharDir}composer.phar")) {
+			if (file_exists("{$this->pharDir}composer.phar")) {
 				$this->out('<warning>Composer is installed, but there was an error executing it.</warning>');
 			} else {
 				$this->out('<warning>Composer is not installed.</warning>');
@@ -197,7 +197,7 @@ protected function _checkComposerPhar() {
 	 */
 	protected function _checkComposerJSON() {
 		if (file_exists('composer.json')) $jsonLocation = 'composer.json';
-		else $jsonLocation = APP.'composer.json';
+		else $jsonLocation = APP . 'composer.json';
 
 		$jsonSave = false;
 		if (file_exists($jsonLocation)) {
@@ -228,7 +228,7 @@ protected function _checkComposerJSON() {
 		}
 
 		if ($jsonSave) {
-			if (strnatcmp(phpversion(),'5.4.0') >= 0) {
+			if (strnatcmp(phpversion(), '5.4.0') >= 0) {
 				$encoded = json_encode($json, JSON_PRETTY_PRINT);
 			} else {
 				$encoded = json_encode($json);