dcngmbh / moox_core

Classes/Service/InstallService.php

Doc Comments -3 removed lines

@@ -55,7 +55,6 @@ 
     /**

 	 * Creates .htaccess file inside the root directory

 	 *

-	 * @param string $htaccessFile Path of .htaccess file

 	 * @return void

 	 */

     public function createDefaultHtaccessFile(){

@@ -96,7 +95,6 @@ 
 	/**

 	 * Creates AdditionalConfiguration.php file inside the typo3conf directory

 	 *

-	 * @param string $configurationFile Path of AdditionalConfiguration.php file

 	 * @return void

 	 */

 	public function createDefaultAdditionalConfiguration($extension = NULL){

@@ -140,7 +138,6 @@ 
 	/**

 	 * Creates robots.txt file inside the root directory

 	 *

-	 * @param string $robotsFile Path of robots.txt file

 	 * @return void

 	 */

     public function createDefaultRobots($extension = NULL){

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php

 

 namespace DCNGmbH\MooxCore\Service;

-use TYPO3\CMS\Core\Utility\GeneralUtility;

-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;

-use TYPO3\CMS\Core\Messaging\FlashMessage;

+use TYPO3\CMS\Core\Utility\GeneralUtility;
+use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
+use TYPO3\CMS\Core\Messaging\FlashMessage;
 use TYPO3\CMS\Core\Utility\VersionNumberUtility;

 

 class InstallService {

Spacing +18 added lines, -18 removed lines

@@ -21,10 +21,10 @@ 
     /**

      * Initializes the install service

      */

-    public function __construct(){

-	    if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){

+    public function __construct() {

+	    if (VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version)>=7000000) {

 		    $this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';

-	    }else{

+	    }else {

 		    $this->messageQueueByIdentifier = 'core.template.flashMessages';

 	    }

     }

@@ -32,11 +32,11 @@ 
     /**

      * @param string $extension

      */

-    public function generateApacheHtaccess($extension = NULL){

-        if($extension == $this->extKey){

-            if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){

+    public function generateApacheHtaccess($extension = NULL) {

+        if ($extension==$this->extKey) {

+            if (substr($_SERVER['SERVER_SOFTWARE'], 0, 6)==='Apache') {

                 $this->createDefaultHtaccessFile();

-            }else{

+            }else {

                 /**

                  * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually

                  */

@@ -58,10 +58,10 @@ 
 	 * @param string $htaccessFile Path of .htaccess file

 	 * @return void

 	 */

-    public function createDefaultHtaccessFile(){

+    public function createDefaultHtaccessFile() {

         $htaccessFile = GeneralUtility::getFileAbsFileName(".htaccess");

                 

-        if(file_exists($htaccessFile)){

+        if (file_exists($htaccessFile)) {

             

             /**

              * Add Flashmessage that there is already an .htaccess file and we are not going to override this.

@@ -99,12 +99,12 @@ 
 	 * @param string $configurationFile Path of AdditionalConfiguration.php file

 	 * @return void

 	 */

-	public function createDefaultAdditionalConfiguration($extension = NULL){

-		if($extension == $this->extKey){

+	public function createDefaultAdditionalConfiguration($extension = NULL) {

+		if ($extension==$this->extKey) {

 

 			$configurationFile = GeneralUtility::getFileAbsFileName("typo3conf/AdditionalConfiguration.php");

 

-			if(file_exists($configurationFile)){

+			if (file_exists($configurationFile)) {

 

 				/**

 				 * Add Flashmessage that there is already an AdditionalConfiguration.php file and we are not going to override this.

@@ -143,12 +143,12 @@ 
 	 * @param string $robotsFile Path of robots.txt file

 	 * @return void

 	 */

-    public function createDefaultRobots($extension = NULL){

-	if($extension == $this->extKey){

+    public function createDefaultRobots($extension = NULL) {

+	if ($extension==$this->extKey) {

 	

 	    $robotsFile = GeneralUtility::getFileAbsFileName("robots.txt");

 		    

-	    if(file_exists($robotsFile)){

+	    if (file_exists($robotsFile)) {

 		

 		/**

 		 * Add Flashmessage that there is already an robots.txt file and we are not going to override this.

@@ -173,7 +173,7 @@ 
 	    $robotsContent .= "Disallow: /*?id=* \n";

 	    $robotsContent .= "Disallow: /*&type=98 \n";

 	    $robotsContent .= " \n";

-	    $robotsContent .= "Sitemap: http://" .$_SERVER['HTTP_HOST']. "/sitemap.xml";

+	    $robotsContent .= "Sitemap: http://".$_SERVER['HTTP_HOST']."/sitemap.xml";

 	    GeneralUtility::writeFile($robotsFile, $robotsContent, TRUE);

 	    

 	    /**

@@ -195,8 +195,8 @@ 
      *

      * @param FlashMessage $flashMessage

      */

-    public function addFlashMessage(FlashMessage $flashMessage){

-	    if($flashMessage){

+    public function addFlashMessage(FlashMessage $flashMessage) {

+	    if ($flashMessage) {

 		    /** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */

 		    $flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');

 		    /** @var $flashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */

Braces +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
     public function __construct(){

 	    if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){

 		    $this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';

-	    }else{

+	    } else{

 		    $this->messageQueueByIdentifier = 'core.template.flashMessages';

 	    }

     }

@@ -36,7 +36,7 @@ 
         if($extension == $this->extKey){

             if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){

                 $this->createDefaultHtaccessFile();

-            }else{

+            } else{

                 /**

                  * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually

                  */

Indentation +106 added lines, -106 removed lines

@@ -8,90 +8,90 @@ 
 

 class InstallService {

     

-    /**

-    * @var string

-    */

-    protected $extKey = 'moox_core';

+	/**

+	 * @var string

+	 */

+	protected $extKey = 'moox_core';

     

-    /**

-     * @var string

-     */

-    protected $messageQueueByIdentifier = '';

+	/**

+	 * @var string

+	 */

+	protected $messageQueueByIdentifier = '';

 

-    /**

-     * Initializes the install service

-     */

-    public function __construct(){

-	    if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){

-		    $this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';

-	    }else{

-		    $this->messageQueueByIdentifier = 'core.template.flashMessages';

-	    }

-    }

+	/**

+	 * Initializes the install service

+	 */

+	public function __construct(){

+		if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) >= 7000000){

+			$this->messageQueueByIdentifier = 'extbase.flashmessages.tx_extensionmanager_tools_extensionmanagerextensionmanager';

+		}else{

+			$this->messageQueueByIdentifier = 'core.template.flashMessages';

+		}

+	}

 

-    /**

-     * @param string $extension

-     */

-    public function generateApacheHtaccess($extension = NULL){

-        if($extension == $this->extKey){

-            if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){

-                $this->createDefaultHtaccessFile();

-            }else{

-                /**

-                 * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually

-                 */

-                $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

-                   'The Bootstrap Package uses RealUrl to generate SEO friendly URLs by default, please take care of the URLs rewriting settings for your environment yourself.'

-                    . 'You can also deactivate RealUrl by changing your TypoScript setup to "config.tx_realurl_enable = 0".',

-                   'TYPO3 is not running on an Apache-Webserver',

-                   FlashMessage::WARNING,

-                   TRUE

-                );

-                $this->addFlashMessage($flashMessage);

-                return;

-            }

-        }

-    }

-    /**

+	/**

+	 * @param string $extension

+	 */

+	public function generateApacheHtaccess($extension = NULL){

+		if($extension == $this->extKey){

+			if(substr($_SERVER['SERVER_SOFTWARE'], 0, 6) === 'Apache'){

+				$this->createDefaultHtaccessFile();

+			}else{

+				/**

+				 * Add Flashmessage that the system it not running on an apache webserver and the url rewritings must be handled manually

+				 */

+				$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

+				   'The Bootstrap Package uses RealUrl to generate SEO friendly URLs by default, please take care of the URLs rewriting settings for your environment yourself.'

+					. 'You can also deactivate RealUrl by changing your TypoScript setup to "config.tx_realurl_enable = 0".',

+				   'TYPO3 is not running on an Apache-Webserver',

+				   FlashMessage::WARNING,

+				   TRUE

+				);

+				$this->addFlashMessage($flashMessage);

+				return;

+			}

+		}

+	}

+	/**

 	 * Creates .htaccess file inside the root directory

 	 *

 	 * @param string $htaccessFile Path of .htaccess file

 	 * @return void

 	 */

-    public function createDefaultHtaccessFile(){

-        $htaccessFile = GeneralUtility::getFileAbsFileName(".htaccess");

+	public function createDefaultHtaccessFile(){

+		$htaccessFile = GeneralUtility::getFileAbsFileName(".htaccess");

                 

-        if(file_exists($htaccessFile)){

+		if(file_exists($htaccessFile)){

             

-            /**

-             * Add Flashmessage that there is already an .htaccess file and we are not going to override this.

-             */

-            $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

-                'There is already an Apache .htaccess file in the root directory, please make sure that the url rewritings are set properly.'

-                . 'An example configuration is located at: typo3conf/ext/moox_core/Configuration/Apache/.htaccess',

-                'Apache .htaccess file already exists',

-                FlashMessage::NOTICE,

-                TRUE

-            );

-            $this->addFlashMessage($flashMessage);

+			/**

+			 * Add Flashmessage that there is already an .htaccess file and we are not going to override this.

+			 */

+			$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

+				'There is already an Apache .htaccess file in the root directory, please make sure that the url rewritings are set properly.'

+				. 'An example configuration is located at: typo3conf/ext/moox_core/Configuration/Apache/.htaccess',

+				'Apache .htaccess file already exists',

+				FlashMessage::NOTICE,

+				TRUE

+			);

+			$this->addFlashMessage($flashMessage);

 			return;

 	}

                    

-        $htaccessContent = GeneralUtility::getUrl(ExtensionManagementUtility::extPath($this->extKey).'/Configuration/Apache/_.htaccess');

-        GeneralUtility::writeFile($htaccessFile, $htaccessContent, TRUE);

+		$htaccessContent = GeneralUtility::getUrl(ExtensionManagementUtility::extPath($this->extKey).'/Configuration/Apache/_.htaccess');

+		GeneralUtility::writeFile($htaccessFile, $htaccessContent, TRUE);

         

-        /**

-         * Add Flashmessage that the example htaccess file was placed in the root directory

-         */

-        $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

-            'For RealURL and optimization purposes an example .htaccess file was placed in your root directory.'

-            . ' Please check if the RewriteBase correctly set for your environment. ',

-            'Apache example .htaccess was placed in the root directory.',

-            FlashMessage::OK,

-            TRUE

-       );

-       $this->addFlashMessage($flashMessage);

-    }

+		/**

+		 * Add Flashmessage that the example htaccess file was placed in the root directory

+		 */

+		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

+			'For RealURL and optimization purposes an example .htaccess file was placed in your root directory.'

+			. ' Please check if the RewriteBase correctly set for your environment. ',

+			'Apache example .htaccess was placed in the root directory.',

+			FlashMessage::OK,

+			TRUE

+	   );

+	   $this->addFlashMessage($flashMessage);

+	}

 

 	/**

 	 * Creates AdditionalConfiguration.php file inside the typo3conf directory

@@ -143,39 +143,39 @@ 
 	 * @param string $robotsFile Path of robots.txt file

 	 * @return void

 	 */

-    public function createDefaultRobots($extension = NULL){

+	public function createDefaultRobots($extension = NULL){

 	if($extension == $this->extKey){

 	

-	    $robotsFile = GeneralUtility::getFileAbsFileName("robots.txt");

+		$robotsFile = GeneralUtility::getFileAbsFileName("robots.txt");

 		    

-	    if(file_exists($robotsFile)){

+		if(file_exists($robotsFile)){

 		

 		/**

 		 * Add Flashmessage that there is already an robots.txt file and we are not going to override this.

 		 */

 		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

-		    'There is already an robots.txt file in the root directory.'

-		    . 'An example robots.txt is located at: typo3conf/ext/moox_core/Configuration/Robots/robots.txt',

-		    'robots.txt file already exists',

-		    FlashMessage::NOTICE,

-		    TRUE

+			'There is already an robots.txt file in the root directory.'

+			. 'An example robots.txt is located at: typo3conf/ext/moox_core/Configuration/Robots/robots.txt',

+			'robots.txt file already exists',

+			FlashMessage::NOTICE,

+			TRUE

 		);

 		$this->addFlashMessage($flashMessage);

-			    return;

-		    }

+				return;

+			}

 		       

-	    $robotsContent .= "User-Agent: * \n";

-	    $robotsContent .= " \n";

-	    $robotsContent .= "Allow: / \n";

-	    $robotsContent .= "Disallow: /typo3/ \n";

-	    $robotsContent .= " \n";

-	    $robotsContent .= "Sitemap: http://" .$_SERVER['HTTP_HOST']. "/sitemap.xml";

-	    GeneralUtility::writeFile($robotsFile, $robotsContent, TRUE);

+		$robotsContent .= "User-Agent: * \n";

+		$robotsContent .= " \n";

+		$robotsContent .= "Allow: / \n";

+		$robotsContent .= "Disallow: /typo3/ \n";

+		$robotsContent .= " \n";

+		$robotsContent .= "Sitemap: http://" .$_SERVER['HTTP_HOST']. "/sitemap.xml";

+		GeneralUtility::writeFile($robotsFile, $robotsContent, TRUE);

 	    

-	    /**

-	     * Add Flashmessage that the example AdditionalCOnfiguration.php file was placed in the typo3conf directory

-	     */

-	    $flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

+		/**

+		 * Add Flashmessage that the example AdditionalCOnfiguration.php file was placed in the typo3conf directory

+		 */

+		$flashMessage = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

 		'robots.txt file was placed in your root directory.',

 		'robots.txt was placed in the root directory.',

 		FlashMessage::OK,

@@ -184,21 +184,21 @@ 
 	   $this->addFlashMessage($flashMessage);

 	   

 	}

-    }

+	}

     

-    /**

-     * Adds a Flash Message to the Flash Message Queue

-     *

-     * @param FlashMessage $flashMessage

-     */

-    public function addFlashMessage(FlashMessage $flashMessage){

-	    if($flashMessage){

-		    /** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */

-		    $flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');

-		    /** @var $flashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */

-		    $flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($this->messageQueueByIdentifier);

-		    $flashMessageQueue->enqueue($flashMessage);

-	    }

-    }

+	/**

+	 * Adds a Flash Message to the Flash Message Queue

+	 *

+	 * @param FlashMessage $flashMessage

+	 */

+	public function addFlashMessage(FlashMessage $flashMessage){

+		if($flashMessage){

+			/** @var $flashMessageService \TYPO3\CMS\Core\Messaging\FlashMessageService */

+			$flashMessageService = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');

+			/** @var $flashMessageQueue \TYPO3\CMS\Core\Messaging\FlashMessageQueue */

+			$flashMessageQueue = $flashMessageService->getMessageQueueByIdentifier($this->messageQueueByIdentifier);

+			$flashMessageQueue->enqueue($flashMessage);

+		}

+	}

 

 }

Contrib/less.php/Cache.php

Doc Comments +7 added lines

@@ -155,6 +155,9 @@ 
 	}
 
 
+	/**
+	 * @param string $compiled_name
+	 */
 	private static function OutputFile( $compiled_name, $parser_options ){
 
 		//custom output file
@@ -184,6 +187,9 @@ 
 	}
 
 
+	/**
+	 * @param string $dir
+	 */
 	public static function SetCacheDir( $dir ){
 		Less_Cache::$cache_dir = $dir;
 	}
@@ -276,6 +282,7 @@ 
 	/**
 	 * Get the list of less files and generated css file from a list file
 	 *
+	 * @param string $list_file
 	 */
 	static function ListFiles($list_file, &$list, &$css_file_name ){
 

Braces +2 added lines, -2 removed lines

@@ -198,10 +198,10 @@
 				throw new Less_Exception_Parser('Less.php cache directory couldn\'t be created: '.Less_Cache::$cache_dir);
 			}
 
-		}elseif( !is_dir(Less_Cache::$cache_dir) ){
+		} elseif( !is_dir(Less_Cache::$cache_dir) ){
 			throw new Less_Exception_Parser('Less.php cache directory doesn\'t exist: '.Less_Cache::$cache_dir);
 
-		}elseif( !is_writable(Less_Cache::$cache_dir) ){
+		} elseif( !is_writable(Less_Cache::$cache_dir) ){
 			throw new Less_Exception_Parser('Less.php cache directory isn\'t writable: '.Less_Cache::$cache_dir);
 
 		}

Spacing +67 added lines, -67 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once( dirname(__FILE__).'/Version.php');
+require_once(dirname(__FILE__).'/Version.php');
 
 /**
  * Utility for handling the generation and caching of css files
@@ -9,13 +9,13 @@ 
  * @subpackage cache
  *
  */
-class Less_Cache{
+class Less_Cache {
 
 	// directory less.php can use for storing data
-	public static $cache_dir	= false;
+	public static $cache_dir = false;
 
 	// prefix for the storing data
-	public static $prefix		= 'lessphp_';
+	public static $prefix = 'lessphp_';
 
 	// prefix for the storing vars
 	public static $prefix_vars	= 'lessphpvars_';
@@ -34,31 +34,31 @@ 
 	 * @param array $modify_vars Array of variables
 	 * @return string Name of the css file
 	 */
-	public static function Get( $less_files, $parser_options = array(), $modify_vars = array() ){
+	public static function Get($less_files, $parser_options = array(), $modify_vars = array()) {
 
 
 		//check $cache_dir
-		if( isset($parser_options['cache_dir']) ){
+		if (isset($parser_options['cache_dir'])) {
 			Less_Cache::$cache_dir = $parser_options['cache_dir'];
 		}
 
-		if( empty(Less_Cache::$cache_dir) ){
+		if (empty(Less_Cache::$cache_dir)) {
 			throw new Exception('cache_dir not set');
 		}
 
-		if( isset($parser_options['prefix']) ){
+		if (isset($parser_options['prefix'])) {
 			Less_Cache::$prefix = $parser_options['prefix'];
 		}
 
-		if( empty(Less_Cache::$prefix) ){
+		if (empty(Less_Cache::$prefix)) {
 			throw new Exception('prefix not set');
 		}
 
-		if( isset($parser_options['prefix_vars']) ){
+		if (isset($parser_options['prefix_vars'])) {
 			Less_Cache::$prefix_vars = $parser_options['prefix_vars'];
 		}
 
-		if( empty(Less_Cache::$prefix_vars) ){
+		if (empty(Less_Cache::$prefix_vars)) {
 			throw new Exception('prefix_vars not set');
 		}
 
@@ -67,11 +67,11 @@ 
 
 
 		//create a file for variables
-		if( !empty($modify_vars) ){
+		if (!empty($modify_vars)) {
 			$lessvars = Less_Parser::serializeVars($modify_vars);
-			$vars_file = Less_Cache::$cache_dir . Less_Cache::$prefix_vars . sha1($lessvars) . '.less';
+			$vars_file = Less_Cache::$cache_dir.Less_Cache::$prefix_vars.sha1($lessvars).'.less';
 
-			if( !file_exists($vars_file) ){
+			if (!file_exists($vars_file)) {
 				file_put_contents($vars_file, $lessvars);
 			}
 
@@ -81,22 +81,22 @@ 
 
 		// generate name for compiled css file
 		$hash = md5(json_encode($less_files));
- 		$list_file = Less_Cache::$cache_dir . Less_Cache::$prefix . $hash . '.list';
+ 		$list_file = Less_Cache::$cache_dir.Less_Cache::$prefix.$hash.'.list';
 
 
  		// check cached content
- 		if( !isset($parser_options['use_cache']) || $parser_options['use_cache'] === true ){
-			if( file_exists($list_file) ){
+ 		if (!isset($parser_options['use_cache']) || $parser_options['use_cache']===true) {
+			if (file_exists($list_file)) {
 
 				self::ListFiles($list_file, $list, $cached_name);
 				$compiled_name = self::CompiledName($list);
 
 				// if $cached_name != $compiled_name, we know we need to recompile
-				if( !$cached_name || $cached_name === $compiled_name ){
+				if (!$cached_name || $cached_name===$compiled_name) {
 
-					$output_file = self::OutputFile($compiled_name, $parser_options );
+					$output_file = self::OutputFile($compiled_name, $parser_options);
 
-					if( $output_file && file_exists($output_file) ){
+					if ($output_file && file_exists($output_file)) {
 						@touch($list_file);
 						return basename($output_file); // for backwards compatibility, we just return the name of the file
 					}
@@ -104,24 +104,24 @@ 
 			}
 		}
 
-		$compiled = self::Cache( $less_files, $parser_options );
-		if( !$compiled ){
+		$compiled = self::Cache($less_files, $parser_options);
+		if (!$compiled) {
 			return false;
 		}
 
-		$compiled_name = self::CompiledName( $less_files );
-		$output_file = self::OutputFile($compiled_name, $parser_options );
+		$compiled_name = self::CompiledName($less_files);
+		$output_file = self::OutputFile($compiled_name, $parser_options);
 
 
 		//save the file list
 		$list = $less_files;
 		$list[] = $compiled_name;
-		$cache = implode("\n",$list);
-		file_put_contents( $list_file, $cache );
+		$cache = implode("\n", $list);
+		file_put_contents($list_file, $cache);
 
 
 		//save the css
-		file_put_contents( $output_file, $compiled );
+		file_put_contents($output_file, $compiled);
 
 
 		//clean up
@@ -138,17 +138,17 @@ 
 	 * @param array $modify_vars Array of variables
 	 * @return string Name of the css file
 	 */
-	public static function Regen( $less_files, $parser_options = array(), $modify_vars = array() ){
+	public static function Regen($less_files, $parser_options = array(), $modify_vars = array()) {
 		$parser_options['use_cache'] = false;
-		return self::Get( $less_files, $parser_options, $modify_vars );
+		return self::Get($less_files, $parser_options, $modify_vars);
 	}
 
-	public static function Cache( &$less_files, $parser_options = array() ){
+	public static function Cache(&$less_files, $parser_options = array()) {
 
 
 		// get less.php if it exists
-		$file = dirname(__FILE__) . '/Less.php';
-		if( file_exists($file) && !class_exists('Less_Parser') ){
+		$file = dirname(__FILE__).'/Less.php';
+		if (file_exists($file) && !class_exists('Less_Parser')) {
 			require_once($file);
 		}
 
@@ -157,15 +157,15 @@ 
 
 
 		// combine files
-		foreach($less_files as $file_path => $uri_or_less ){
+		foreach ($less_files as $file_path => $uri_or_less) {
 
 			//treat as less markup if there are newline characters
-			if( strpos($uri_or_less,"\n") !== false ){
-				$parser->Parse( $uri_or_less );
+			if (strpos($uri_or_less, "\n")!==false) {
+				$parser->Parse($uri_or_less);
 				continue;
 			}
 
-			$parser->ParseFile( $file_path, $uri_or_less );
+			$parser->ParseFile($file_path, $uri_or_less);
 		}
 
 		$compiled = $parser->getCss();
@@ -177,13 +177,13 @@ 
 	}
 
 
-	private static function OutputFile( $compiled_name, $parser_options ){
+	private static function OutputFile($compiled_name, $parser_options) {
 
 		//custom output file
-		if( !empty($parser_options['output']) ){
+		if (!empty($parser_options['output'])) {
 
 			//relative to cache directory?
-			if( preg_match('#[\\\\/]#',$parser_options['output']) ){
+			if (preg_match('#[\\\\/]#', $parser_options['output'])) {
 				return $parser_options['output'];
 			}
 
@@ -194,11 +194,11 @@ 
 	}
 
 
-	private static function CompiledName( $files ){
+	private static function CompiledName($files) {
 
 		//save the file list
 		$temp = array(Less_Version::cache_version);
-		foreach($files as $file){
+		foreach ($files as $file) {
 			$temp[] = filemtime($file)."\t".filesize($file)."\t".$file;
 		}
 
@@ -206,24 +206,24 @@ 
 	}
 
 
-	public static function SetCacheDir( $dir ){
+	public static function SetCacheDir($dir) {
 		Less_Cache::$cache_dir = $dir;
 	}
 
-	public static function CheckCacheDir(){
+	public static function CheckCacheDir() {
 
-		Less_Cache::$cache_dir = str_replace('\\','/',Less_Cache::$cache_dir);
-		Less_Cache::$cache_dir = rtrim(Less_Cache::$cache_dir,'/').'/';
+		Less_Cache::$cache_dir = str_replace('\\', '/', Less_Cache::$cache_dir);
+		Less_Cache::$cache_dir = rtrim(Less_Cache::$cache_dir, '/').'/';
 
-		if( !file_exists(Less_Cache::$cache_dir) ){
-			if( !mkdir(Less_Cache::$cache_dir) ){
+		if (!file_exists(Less_Cache::$cache_dir)) {
+			if (!mkdir(Less_Cache::$cache_dir)) {
 				throw new Less_Exception_Parser('Less.php cache directory couldn\'t be created: '.Less_Cache::$cache_dir);
 			}
 
-		}elseif( !is_dir(Less_Cache::$cache_dir) ){
+		}elseif (!is_dir(Less_Cache::$cache_dir)) {
 			throw new Less_Exception_Parser('Less.php cache directory doesn\'t exist: '.Less_Cache::$cache_dir);
 
-		}elseif( !is_writable(Less_Cache::$cache_dir) ){
+		}elseif (!is_writable(Less_Cache::$cache_dir)) {
 			throw new Less_Exception_Parser('Less.php cache directory isn\'t writable: '.Less_Cache::$cache_dir);
 
 		}
@@ -235,53 +235,53 @@ 
 	 * Delete unused less.php files
 	 *
 	 */
-	public static function CleanCache(){
+	public static function CleanCache() {
 		static $clean = false;
 
-		if( $clean ){
+		if ($clean) {
 			return;
 		}
 
 		$files = scandir(Less_Cache::$cache_dir);
-		if( $files ){
-			$check_time = time() - self::$gc_lifetime;
-			foreach($files as $file){
+		if ($files) {
+			$check_time = time()-self::$gc_lifetime;
+			foreach ($files as $file) {
 
 				// don't delete if the file wasn't created with less.php
-				if( strpos($file,Less_Cache::$prefix) !== 0 ){
+				if (strpos($file, Less_Cache::$prefix)!==0) {
 					continue;
 				}
 
-				$full_path = Less_Cache::$cache_dir . $file;
+				$full_path = Less_Cache::$cache_dir.$file;
 
 				// make sure the file still exists
 				// css files may have already been deleted
-				if( !file_exists($full_path) ){
+				if (!file_exists($full_path)) {
 					continue;
 				}
 				$mtime = filemtime($full_path);
 
 				// don't delete if it's a relatively new file
-				if( $mtime > $check_time ){
+				if ($mtime>$check_time) {
 					continue;
 				}
 
-				$parts = explode('.',$file);
+				$parts = explode('.', $file);
 				$type = array_pop($parts);
 
 
 				// delete css files based on the list files
-				if( $type === 'css' ){
+				if ($type==='css') {
 					continue;
 				}
 
 
 				// delete the list file and associated css file
-				if( $type === 'list' ){
+				if ($type==='list') {
 					self::ListFiles($full_path, $list, $css_file_name);
-					if( $css_file_name ){
-						$css_file = Less_Cache::$cache_dir . $css_file_name;
-						if( file_exists($css_file) ){
+					if ($css_file_name) {
+						$css_file = Less_Cache::$cache_dir.$css_file_name;
+						if (file_exists($css_file)) {
 							unlink($css_file);
 						}
 					}
@@ -299,14 +299,14 @@ 
 	 * Get the list of less files and generated css file from a list file
 	 *
 	 */
-	static function ListFiles($list_file, &$list, &$css_file_name ){
+	static function ListFiles($list_file, &$list, &$css_file_name) {
 
-		$list = explode("\n",file_get_contents($list_file));
+		$list = explode("\n", file_get_contents($list_file));
 
 		//pop the cached name that should match $compiled_name
 		$css_file_name = array_pop($list);
 
-		if( !preg_match('/^' . Less_Cache::$prefix . '[a-f0-9]+\.css$/',$css_file_name) ){
+		if (!preg_match('/^'.Less_Cache::$prefix.'[a-f0-9]+\.css$/', $css_file_name)) {
 			$list[] = $css_file_name;
 			$css_file_name = false;
 		}

Classes/Controller/ContentController.php

Indentation +14 added lines, -14 removed lines

@@ -38,9 +38,9 @@ 
  */
 class ContentController extends AbstractContentController {
     
-        /**
-	 * @return void
-	 */
+		/**
+		 * @return void
+		 */
 	protected function initializeOverriddenSettings() {
 		$record = $this->getRecord();
 		$useTypoScriptOptionFromForm = $this->provider->getForm($record)->getOption('useTypoScript');
@@ -113,9 +113,9 @@ 
 
 	}
         
-        /**
-	 * @return string
-	 */
+		/**
+		 * @return string
+		 */
 	public function progressBarAction() {
 
 	}
@@ -162,18 +162,18 @@ 
 
 	}
         
-        /**
-	 * @return string
-	 */
+		/**
+		 * @return string
+		 */
 	public function fourColumnAction() {
 
 	}
         
-        /**
-	 * @return string
-	 */
-        public function imageGalleryAction() {
+		/**
+		 * @return string
+		 */
+		public function imageGalleryAction() {
     
-        }
+		}
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	protected function initializeOverriddenSettings() {
 		$record = $this->getRecord();
 		$useTypoScriptOptionFromForm = $this->provider->getForm($record)->getOption('useTypoScript');
-		if (NULL !== $useTypoScriptOptionFromForm) {
+		if (NULL!==$useTypoScriptOptionFromForm) {
 			$this->settings['useTypoScript'] = (boolean)$useTypoScriptOptionFromForm;
 		}
 		parent::initializeOverriddenSettings();

Classes/Controller/CoreContentController.php

Spacing +11 added lines, -11 removed lines

@@ -62,9 +62,9 @@ 
 		$generalSettings = $this->configurationService->convertFlexFormContentToArray($row['pi_flexform'], $form);
 		$contentSettings = $this->configurationService->convertFlexFormContentToArray($row['content_options'], $form);
 		$this->settings = RecursiveArrayUtility::merge($this->settings, $generalSettings, FALSE, FALSE);
-		if (FALSE === isset($this->settings['content'])) {
+		if (FALSE===isset($this->settings['content'])) {
 			$this->settings['content'] = $contentSettings;
-		} else {
+		}else {
 			$this->settings['content'] = RecursiveArrayUtility::merge($this->settings['content'], $contentSettings);
 		}
 		parent::initializeViewVariables();
@@ -145,7 +145,7 @@ 
 				$bindings = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
 					'uid_foreign',
 					'sys_category_record_mm',
-					"fieldname = 'categories' AND tablenames = 'pages' AND uid_local IN (" . $selected . ')',
+					"fieldname = 'categories' AND tablenames = 'pages' AND uid_local IN (".$selected.')',
 					'uid_foreign',
 					'sorting ASC'
 				);
@@ -157,7 +157,7 @@ 
 				$bindings = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
 					'uid_foreign',
 					'sys_category_record_mm',
-					"fieldname = 'categories' AND tablenames = 'tt_content' AND uid_local IN (" . $selected . ')',
+					"fieldname = 'categories' AND tablenames = 'tt_content' AND uid_local IN (".$selected.')',
 					'uid_foreign',
 					'sorting ASC'
 				);
@@ -166,8 +166,8 @@ 
 				break;
 			case CoreContentProvider::MENU_RELATEDPAGES:
 				$whereKeywords = $this->getWhereQueryForKeywords($record);
-				$selectedUids = TRUE === empty($record['pages']) ? $record['uid'] : $record['pages'];
-				$where = $whereKeywords . ' AND uid NOT IN (' . $selectedUids . ')';
+				$selectedUids = TRUE===empty($record['pages']) ? $record['uid'] : $record['pages'];
+				$where = $whereKeywords.' AND uid NOT IN ('.$selectedUids.')';
 				$bindings = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
 					'uid',
 					'pages',
@@ -188,7 +188,7 @@ 
 	public function shortcutAction() {
 		$record = $this->getRecord();
 		$contentUids = array_map(function($index) {
-			if (0 !== strpos($index, 'tt_content_') && FALSE === MathUtility::canBeInterpretedAsInteger($index)) {
+			if (0!==strpos($index, 'tt_content_') && FALSE===MathUtility::canBeInterpretedAsInteger($index)) {
 				return FALSE;
 			}
 			return str_replace('tt_content_', '', $index);
@@ -217,13 +217,13 @@ 
 	 */
 	protected function getWhereQueryForKeywords($record) {
 		$selectedUids = $record['pages'];
-		if (TRUE == empty($selectedUids)) {
+		if (TRUE==empty($selectedUids)) {
 			$selectedUids = $record['pid'];
 		}
 		$keywordsRows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
 			'keywords',
 			'pages',
-			'uid IN (' . $selectedUids . ')',
+			'uid IN ('.$selectedUids.')',
 			'',
 			'sorting ASC'
 		);
@@ -234,10 +234,10 @@ 
 		foreach ($keywordsArray as $word) {
 			$word = trim($word);
 			if ($word) {
-				$keyWordsWhereArr[] = 'keywords LIKE \'%' . $GLOBALS['TYPO3_DB']->quoteStr($word, 'pages') . '%\'';
+				$keyWordsWhereArr[] = 'keywords LIKE \'%'.$GLOBALS['TYPO3_DB']->quoteStr($word, 'pages').'%\'';
 			}
 		}
-		$where = empty($keyWordsWhereArr) ? '' : '(' . implode(' OR ', $keyWordsWhereArr) . ')';
+		$where = empty($keyWordsWhereArr) ? '' : '('.implode(' OR ', $keyWordsWhereArr).')';
 		return $where;
 	}
 

Classes/Hooks/PageRendererRender/PreProcessHook.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
 	 */
 	public function execute(&$params, &$pagerenderer) {
 
-		if (TYPO3_MODE !== 'FE' || !is_array($params['cssFiles'])) {
+		if (TYPO3_MODE!=='FE' || !is_array($params['cssFiles'])) {
 			return;
 		}
 		$files = array();
@@ -49,7 +49,7 @@ 
 			if ($compiledFile) {
 				$settings['file'] = $compiledFile;
 				$files[$compiledFile] = $settings;
-			} else {
+			}else {
 				$files[$file] = $settings;
 			}
 		}

Classes/Hooks/WizardItemsHookSubscriber.php

Indentation +8 added lines, -8 removed lines

@@ -7,12 +7,12 @@
  * WizardItems Hook Subscriber
  */
 class WizardItemsHookSubscriber extends \FluidTYPO3\Fluidcontent\Hooks\WizardItemsHookSubscriber implements NewContentElementWizardHookInterface {
-    /**
-     * @param array $items
-     * @param NewContentElementController $parentObject
-     * @return void
-     */
-    public function manipulateWizardItems(&$items, &$parentObject) {
-        parent::manipulateWizardItems($items, $parentObject);
-    }
+	/**
+	 * @param array $items
+	 * @param NewContentElementController $parentObject
+	 * @return void
+	 */
+	public function manipulateWizardItems(&$items, &$parentObject) {
+		parent::manipulateWizardItems($items, $parentObject);
+	}
 }
\ No newline at end of file

Classes/Provider/CoreContentProvider.php

Indentation +2 added lines, -2 removed lines

@@ -109,8 +109,8 @@
 	);
 	
 	/**
-	* @var ConfigurationService
-	*/
+	 * @var ConfigurationService
+	 */
 	protected $configurationService;
 
 	/**

Spacing +13 added lines, -13 removed lines

@@ -143,7 +143,7 @@ 
 	 * @return boolean
 	 */
 	public function trigger(array $row, $table, $field, $extensionKey = NULL) {
-		return ($table === $this->tableName && ($field === $this->fieldName || NULL === $field));
+		return ($table===$this->tableName && ($field===$this->fieldName || NULL===$field));
 	}
 
 	/**
@@ -151,14 +151,14 @@ 
 	 * @return Form
 	 */
 	public function getForm(array $row) {
-		if (self::CTYPE_MENU === $row[self::CTYPE_FIELDNAME]) {
+		if (self::CTYPE_MENU===$row[self::CTYPE_FIELDNAME]) {
 			// addtional menu variables
 			$menuType = $row[self::MENUTYPE_FIELDNAME];
 			$partialTemplateName = $this->menuTypeToSectionNameMap[$menuType];
 			$this->templateVariables['menuPartialTemplateName'] = $partialTemplateName;
 			$this->templateVariables['pageUids'] = GeneralUtility::trimExplode(',', $row['pages']);
 		}
-		if (self::CTYPE_TABLE == $row[self::CTYPE_FIELDNAME]) {
+		if (self::CTYPE_TABLE==$row[self::CTYPE_FIELDNAME]) {
 			$this->templateVariables['tableHeadPositions'] = array(
 				self::THEAD_NONE => LocalizationUtility::translate('tableHead.none', 'moox_core'),
 				self::THEAD_TOP => LocalizationUtility::translate('tableHead.top', 'moox_core'),
@@ -174,7 +174,7 @@ 
 	 */
 	public function getExtensionKey(array $row) {
 		$extensionKey = $this->extensionKey;
-		if (FALSE === empty($row['content_variant'])) {
+		if (FALSE===empty($row['content_variant'])) {
 			$extensionKey = $row['content_variant'];
 		}
 		return ExtensionNamingUtility::getExtensionKey($extensionKey);
@@ -196,8 +196,8 @@ 
 		$extensionKey = $this->getExtensionKey($row);
 		$variant = $this->getVariant($row);
 		$version = $this->getVersion($row);
-		$registeredTypes = (array) $GLOBALS['TYPO3_CONF_VARS']['DCNGmbH.MooxCore']['types'];
-		$templateName = TRUE === in_array($row['CType'], $registeredTypes) ? $row['CType'] : 'default';
+		$registeredTypes = (array)$GLOBALS['TYPO3_CONF_VARS']['DCNGmbH.MooxCore']['types'];
+		$templateName = TRUE===in_array($row['CType'], $registeredTypes) ? $row['CType'] : 'default';
 		$template = $this->configurationService->resolveTemplateFileForVariant($extensionKey, $templateName, $variant, $version);
  		return $template;
 	}
@@ -208,7 +208,7 @@ 
 	 */
 	protected function getVariant(array $row) {
 		$defaults = $this->configurationService->getDefaults();
-		if (self::MODE_RECORD !== $defaults['mode'] && TRUE === empty($row['content_variant'])) {
+		if (self::MODE_RECORD!==$defaults['mode'] && TRUE===empty($row['content_variant'])) {
 			return $defaults['variant'];
 		}
 		return $row['content_variant'];
@@ -220,7 +220,7 @@ 
 	 */
 	protected function getVersion(array $row) {
 		$defaults = $this->configurationService->getDefaults();
-		if (self::MODE_RECORD !== $defaults['mode'] && TRUE === empty($row['content_version'])) {
+		if (self::MODE_RECORD!==$defaults['mode'] && TRUE===empty($row['content_version'])) {
 			return $defaults['version'];
 		}
 		return $row['content_version'];
@@ -244,11 +244,11 @@ 
 	 */
 	public function postProcessRecord($operation, $id, array &$row, DataHandler $reference, array $removals = array()) {
 		$defaults = $this->configurationService->getDefaults();
-		if (self::MODE_RECORD === $defaults['mode']) {
-			if (TRUE === empty($row['content_variant'])) {
+		if (self::MODE_RECORD===$defaults['mode']) {
+			if (TRUE===empty($row['content_variant'])) {
 				$row['content_variant'] = $defaults['variant'];
 			}
-			if (TRUE === empty($row['content_version'])) {
+			if (TRUE===empty($row['content_version'])) {
 				$row['content_version'] = $defaults['version'];
 			}
 		}
@@ -263,9 +263,9 @@ 
 		$paths = parent::getTemplatePaths($row);
 
 		$variant = $this->getVariant($row);
-		if (FALSE === empty($variant)) {
+		if (FALSE===empty($variant)) {
 			$extensionKey = ExtensionNamingUtility::getExtensionKey($variant);
-			if (FALSE === empty($extensionKey)) {
+			if (FALSE===empty($extensionKey)) {
 				$overlayPaths = $this->configurationService->getViewConfigurationForExtensionName($extensionKey);
 				$paths = array_merge_recursive($paths, $overlayPaths);
 			}

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
 
 	/**
 	 * @param array $row
-	 * @return string|NULL
+	 * @return string
 	 */
 	public function getExtensionKey(array $row) {
 		$extensionKey = $this->extensionKey;

Classes/Service/ConfigurationService.php

Indentation +6 added lines, -6 removed lines

@@ -134,17 +134,17 @@
 	public function resolveTemplateFileForVariant($extensionKey, $contentType, $variant = NULL, $version = NULL) {
 		$paths = $this->getViewConfigurationForExtensionName(FALSE === empty($variant) ? $variant : $extensionKey);
 		$templatePaths = new TemplatePaths($paths);
-                $controllerName = 'CoreContent';
+				$controllerName = 'CoreContent';
 		$controllerAction = FALSE === empty($version) ? $contentType . '/' . $version : $contentType;
 		return $templatePaths->resolveTemplateFileForControllerAndActionAndFormat($controllerName, $controllerAction);
 	}
 
 	/**
-		 * @param string $extension
-		 * @param string $contentType
-		 * @param string $version
-		 * @return string
-		 */
+	 * @param string $extension
+	 * @param string $contentType
+	 * @param string $version
+	 * @return string
+	 */
 	public function getIconFromVersion($extension, $contentType, $version = NULL) {
 			$extensionKey = ExtensionNamingUtility::getExtensionKey($extension);
 			$templatePathAndFilename = $this->resolveTemplateFileForVariant($extensionKey, $contentType, $extension, $version);

Spacing +15 added lines, -15 removed lines

@@ -49,36 +49,36 @@ 
 	 */
 	protected function initializeDefaults() {
 		$typoScript = $this->getAllTypoScript();
-		$this->defaults = (array) $typoScript['plugin']['tx_mooxcore']['settings']['defaults'];
+		$this->defaults = (array)$typoScript['plugin']['tx_mooxcore']['settings']['defaults'];
 	}
 
 	/**
 	 * @return void
 	 */
 	protected function initializeVariants() {
-		$variants = (array) $this->getAllRegisteredVariants();
+		$variants = (array)$this->getAllRegisteredVariants();
 		foreach ($variants as $contentType => $registeredVariantExtensions) {
-			if (TRUE === empty($registeredVariantExtensions)) {
+			if (TRUE===empty($registeredVariantExtensions)) {
 				continue;
 			}
 			$this->variants[$contentType] = array();
 			foreach ($registeredVariantExtensions as $extensionKeyOrArray) {
 				$icon = NULL;
 				$versions = array();
-				if (TRUE === is_array($extensionKeyOrArray) && 3 === count($extensionKeyOrArray)) {
+				if (TRUE===is_array($extensionKeyOrArray) && 3===count($extensionKeyOrArray)) {
 					list ($extensionKey, $labelReference, $icon) = $extensionKeyOrArray;
-				} elseif (TRUE === is_array($extensionKeyOrArray) && 2 === count($extensionKeyOrArray)) {
+				} elseif (TRUE===is_array($extensionKeyOrArray) && 2===count($extensionKeyOrArray)) {
 					list ($extensionKey, $labelReference) = $extensionKeyOrArray;
-				} else {
+				}else {
 					$extensionKey = ExtensionNamingUtility::getExtensionKey($extensionKeyOrArray);
 					$labelReference = 'moox_core.variantLabel';
 				}
-				$controllerName = 'CoreContent/' . ucfirst($contentType);
+				$controllerName = 'CoreContent/'.ucfirst($contentType);
 				$paths = $this->getViewConfigurationForExtensionName($extensionKey);
 				$templatePaths = new TemplatePaths($paths);
 				$files = $templatePaths->resolveAvailableTemplateFiles($controllerName);
 				foreach ($files as $file) {
-					$versions[] = basename($file, '.' . TemplatePaths::DEFAULT_FORMAT);
+					$versions[] = basename($file, '.'.TemplatePaths::DEFAULT_FORMAT);
 				}
 				$versions = array_unique($versions);
 				$this->versions[$contentType] = array($extensionKey => $versions);
@@ -98,7 +98,7 @@ 
 	 * @return array
 	 */
 	public function getAllRegisteredVariants() {
-		return (array) $GLOBALS['TYPO3_CONF_VARS']['DCNGmbH.MooxCore']['variants'];
+		return (array)$GLOBALS['TYPO3_CONF_VARS']['DCNGmbH.MooxCore']['variants'];
 	}
 
 	/**
@@ -106,7 +106,7 @@ 
 	 * @return array
 	 */
 	public function getVariantExtensionKeysForContentType($contentType) {
-		if (TRUE === isset($this->variants[$contentType])) {
+		if (TRUE===isset($this->variants[$contentType])) {
 			return $this->variants[$contentType];
 		}
 		return array();
@@ -118,7 +118,7 @@ 
 	 * @return array
 	 */
 	public function getVariantVersions($contentType, $variant) {
-		if (TRUE === isset($this->versions[$contentType][$variant])) {
+		if (TRUE===isset($this->versions[$contentType][$variant])) {
 			return $this->versions[$contentType][$variant];
 		}
 		return array();
@@ -132,10 +132,10 @@ 
 	 * @return string
 	 */
 	public function resolveTemplateFileForVariant($extensionKey, $contentType, $variant = NULL, $version = NULL) {
-		$paths = $this->getViewConfigurationForExtensionName(FALSE === empty($variant) ? $variant : $extensionKey);
+		$paths = $this->getViewConfigurationForExtensionName(FALSE===empty($variant) ? $variant : $extensionKey);
 		$templatePaths = new TemplatePaths($paths);
                 $controllerName = 'CoreContent';
-		$controllerAction = FALSE === empty($version) ? $contentType . '/' . $version : $contentType;
+		$controllerAction = FALSE===empty($version) ? $contentType.'/'.$version : $contentType;
 		return $templatePaths->resolveTemplateFileForControllerAndActionAndFormat($controllerName, $controllerAction);
 	}
 
@@ -154,9 +154,9 @@ 
 			$viewContext->setTemplatePaths($templatePaths);
 			$viewContext->setSectionName('Configuration');
 			$form = FluxService::getFormFromTemplateFile($viewContext);
-			if (FALSE === $form instanceof Form) {
+			if (FALSE===$form instanceof Form) {
 					return '';
-		} else {
+		}else {
 					return MiscellaneousUtility::getIconForTemplate($form);
 		}
 	}

Classes/Service/UpdateService.php

Indentation +91 added lines, -91 removed lines

@@ -10,103 +10,103 @@
  */
 class UpdateService {
 
-    /**
-     * @var string
-     */
-    protected $sourceConfigurationLines = array(
-        '$GLOBALS[\'TYPO3_CONF_VARS\'][\'FE\'][\'contentRenderingTemplates\'] = array(\'mooxcore/Configuration/TypoScript/\');',
-        '$GLOBALS[\'TYPO3_CONF_VARS\'][\'FE\'][\'activateContentAdapter\'] = 0;'
-    );
+	/**
+	 * @var string
+	 */
+	protected $sourceConfigurationLines = array(
+		'$GLOBALS[\'TYPO3_CONF_VARS\'][\'FE\'][\'contentRenderingTemplates\'] = array(\'mooxcore/Configuration/TypoScript/\');',
+		'$GLOBALS[\'TYPO3_CONF_VARS\'][\'FE\'][\'activateContentAdapter\'] = 0;'
+	);
 
-    /**
-     * @var string
-     */
-    protected $targetConfigurationFile = 'typo3conf/AdditionalConfiguration.php';
+	/**
+	 * @var string
+	 */
+	protected $targetConfigurationFile = 'typo3conf/AdditionalConfiguration.php';
 
-    /**
-     * Constructor
-     */
-    public function __construct() {
-        $this->targetConfigurationFile = GeneralUtility::getFileAbsFileName($this->targetConfigurationFile);
-    }
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		$this->targetConfigurationFile = GeneralUtility::getFileAbsFileName($this->targetConfigurationFile);
+	}
 
-    /**
-     * @return array
-     */
-    protected function getCurrentConfigurationLines() {
-        if (FALSE === file_exists($this->targetConfigurationFile)) {
-            // We return not a completely empty array but an array containing the
-            // expected opening PHP tag; to make sure it ends up in the output.
-            return array('<?php');
-        }
-        $lines = explode(PHP_EOL, trim(file_get_contents($this->targetConfigurationFile)));
-        if (0 === count($lines) || '<?php' !== $lines[0]) {
-            array_unshift($lines, '<?php');
-        }
-        return $lines;
-    }
+	/**
+	 * @return array
+	 */
+	protected function getCurrentConfigurationLines() {
+		if (FALSE === file_exists($this->targetConfigurationFile)) {
+			// We return not a completely empty array but an array containing the
+			// expected opening PHP tag; to make sure it ends up in the output.
+			return array('<?php');
+		}
+		$lines = explode(PHP_EOL, trim(file_get_contents($this->targetConfigurationFile)));
+		if (0 === count($lines) || '<?php' !== $lines[0]) {
+			array_unshift($lines, '<?php');
+		}
+		return $lines;
+	}
 
-    /**
-     * Returns TRUE if either of the expected configuration lines
-     * do not currently exist. If both exist, returns FALSE
-     * meaning "no need to run the script"
-     *
-     * NOTE: Is required by the extension manager, do not remove or make protected
-     * @api
-     * @return boolean
-     */
-    public function access() {
-        $currentConfiguration = $this->getCurrentConfigurationLines();
-        foreach ($this->sourceConfigurationLines as $expectedConfigurationLine) {
-            if (FALSE === in_array($expectedConfigurationLine, $currentConfiguration)) {
-                return TRUE;
-            }
-        }
-        return FALSE;
-    }
+	/**
+	 * Returns TRUE if either of the expected configuration lines
+	 * do not currently exist. If both exist, returns FALSE
+	 * meaning "no need to run the script"
+	 *
+	 * NOTE: Is required by the extension manager, do not remove or make protected
+	 * @api
+	 * @return boolean
+	 */
+	public function access() {
+		$currentConfiguration = $this->getCurrentConfigurationLines();
+		foreach ($this->sourceConfigurationLines as $expectedConfigurationLine) {
+			if (FALSE === in_array($expectedConfigurationLine, $currentConfiguration)) {
+				return TRUE;
+			}
+		}
+		return FALSE;
+	}
 
-    /**
-     * NOTE: Is required by the extension manager, do not remove or make protected
-     * @api
-     * @return string
-     */
-    public function main() {
-        $this->installAdditionalConfiguration();
-        return 'Additional configuration lines added to AdditionalConfiguration.php';
-    }
+	/**
+	 * NOTE: Is required by the extension manager, do not remove or make protected
+	 * @api
+	 * @return string
+	 */
+	public function main() {
+		$this->installAdditionalConfiguration();
+		return 'Additional configuration lines added to AdditionalConfiguration.php';
+	}
 
-    /**
-     * Install expected lines missing from AdditionalConfiguration file
-     *
-     * @return void
-     */
-    protected function installAdditionalConfiguration() {
-        $currentConfigurationLines = $this->getCurrentConfigurationLines();
-        // remove trailing empty spaces and closing PHP tag to ensure predictable appending:
-        for ($i = count($currentConfigurationLines) - 1; $i--; $i >= 0) {
-            $line = trim($currentConfigurationLines[$i]);
-            if (TRUE === empty($line) || '?>' === $line) {
-                unset($currentConfigurationLines[$i]);
-            }
-        }
-        // add expected lines if they are not found:
-        foreach ($this->sourceConfigurationLines as $expectedConfigurationLine) {
-            if (FALSE === in_array($expectedConfigurationLine, $currentConfigurationLines)) {
-                $currentConfigurationLines[] = $expectedConfigurationLine;
-            }
-        }
-        $this->writeAdditionalConfigurationFile($currentConfigurationLines);
-    }
+	/**
+	 * Install expected lines missing from AdditionalConfiguration file
+	 *
+	 * @return void
+	 */
+	protected function installAdditionalConfiguration() {
+		$currentConfigurationLines = $this->getCurrentConfigurationLines();
+		// remove trailing empty spaces and closing PHP tag to ensure predictable appending:
+		for ($i = count($currentConfigurationLines) - 1; $i--; $i >= 0) {
+			$line = trim($currentConfigurationLines[$i]);
+			if (TRUE === empty($line) || '?>' === $line) {
+				unset($currentConfigurationLines[$i]);
+			}
+		}
+		// add expected lines if they are not found:
+		foreach ($this->sourceConfigurationLines as $expectedConfigurationLine) {
+			if (FALSE === in_array($expectedConfigurationLine, $currentConfigurationLines)) {
+				$currentConfigurationLines[] = $expectedConfigurationLine;
+			}
+		}
+		$this->writeAdditionalConfigurationFile($currentConfigurationLines);
+	}
 
-    /**
-     * Wrapping method to write array to file
-     *
-     * @param array $lines
-     * @return void
-     */
-    protected function writeAdditionalConfigurationFile(array $lines) {
-        $content = implode(PHP_EOL, $lines) . PHP_EOL;
-        file_put_contents($this->targetConfigurationFile, $content);
-    }
+	/**
+	 * Wrapping method to write array to file
+	 *
+	 * @param array $lines
+	 * @return void
+	 */
+	protected function writeAdditionalConfigurationFile(array $lines) {
+		$content = implode(PHP_EOL, $lines) . PHP_EOL;
+		file_put_contents($this->targetConfigurationFile, $content);
+	}
 
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -34,13 +34,13 @@ 
      * @return array
      */
     protected function getCurrentConfigurationLines() {
-        if (FALSE === file_exists($this->targetConfigurationFile)) {
+        if (FALSE===file_exists($this->targetConfigurationFile)) {
             // We return not a completely empty array but an array containing the
             // expected opening PHP tag; to make sure it ends up in the output.
             return array('<?php');
         }
         $lines = explode(PHP_EOL, trim(file_get_contents($this->targetConfigurationFile)));
-        if (0 === count($lines) || '<?php' !== $lines[0]) {
+        if (0===count($lines) || '<?php'!==$lines[0]) {
             array_unshift($lines, '<?php');
         }
         return $lines;
@@ -58,7 +58,7 @@ 
     public function access() {
         $currentConfiguration = $this->getCurrentConfigurationLines();
         foreach ($this->sourceConfigurationLines as $expectedConfigurationLine) {
-            if (FALSE === in_array($expectedConfigurationLine, $currentConfiguration)) {
+            if (FALSE===in_array($expectedConfigurationLine, $currentConfiguration)) {
                 return TRUE;
             }
         }
@@ -83,15 +83,15 @@ 
     protected function installAdditionalConfiguration() {
         $currentConfigurationLines = $this->getCurrentConfigurationLines();
         // remove trailing empty spaces and closing PHP tag to ensure predictable appending:
-        for ($i = count($currentConfigurationLines) - 1; $i--; $i >= 0) {
+        for ($i = count($currentConfigurationLines)-1; $i--; $i>=0) {
             $line = trim($currentConfigurationLines[$i]);
-            if (TRUE === empty($line) || '?>' === $line) {
+            if (TRUE===empty($line) || '?>'===$line) {
                 unset($currentConfigurationLines[$i]);
             }
         }
         // add expected lines if they are not found:
         foreach ($this->sourceConfigurationLines as $expectedConfigurationLine) {
-            if (FALSE === in_array($expectedConfigurationLine, $currentConfigurationLines)) {
+            if (FALSE===in_array($expectedConfigurationLine, $currentConfigurationLines)) {
                 $currentConfigurationLines[] = $expectedConfigurationLine;
             }
         }
@@ -105,7 +105,7 @@ 
      * @return void
      */
     protected function writeAdditionalConfigurationFile(array $lines) {
-        $content = implode(PHP_EOL, $lines) . PHP_EOL;
+        $content = implode(PHP_EOL, $lines).PHP_EOL;
         file_put_contents($this->targetConfigurationFile, $content);
     }