multidimension-al / cakephp-subdomains

src/Routing/SubdomainRouteTrait.php

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

@@ -15,7 +15,7 @@
  
 namespace Multidimensional\Subdomains\Routing;
 
-use Cake\Network\Request; 
+use Cake\Network\Request;
 use Cake\Routing\Router;
 use Cake\Core\Configure;
 

Indentation +11 added lines, -11 removed lines

@@ -22,23 +22,23 @@
 trait SubdomainRouteTrait
 {
  	
-	private function _getSubdomains() {
+    private function _getSubdomains() {
 	
-		$validConfiguration = Configure::check('Multidimensional/Subdomains.subdomains');
+        $validConfiguration = Configure::check('Multidimensional/Subdomains.subdomains');
 		
-		if (!$validConfiguration) {
-			return [];			
-		}
+        if (!$validConfiguration) {
+            return [];			
+        }
 		
-		$subdomains = Configure::read('Multidimensional/Subdomains.subdomains');
+        $subdomains = Configure::read('Multidimensional/Subdomains.subdomains');
 		
-		if (!is_array($subdomains) || count($subdomains) == 0) {
-			return [];	
-		}
+        if (!is_array($subdomains) || count($subdomains) == 0) {
+            return [];	
+        }
 		
-		return $subdomains;
+        return $subdomains;
 		
-	}
+    }
 
     private function _getPrefixAndHost(array $context = []) {
         if (empty($context['_host'])) {

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 use Cake\Routing\Router;
 use Cake\Core\Configure;
 
-trait SubdomainRouteTrait
-{
+trait SubdomainRouteTrait {
  	
 	private function _getSubdomains() {
 	

src/Shell/SubdomainsInstallShell.php

Unused Use Statements -1 removed lines

@@ -17,7 +17,6 @@
 
 use Cake\Core\Configure;
 use Cake\Console\Shell;
-use Cake\Console\Helper;
 
 class SubdomainsInstallShell extends Shell {
     

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
 			
 		}
 	   
-        if ((($first_run) ? (strtolower($this->in('Install Subdomains Plugin?', ['y','n'])) == 'y') : (strtolower($this->in('Update Configuration?', ['y','n'])) == 'y'))) {
+        if ((($first_run) ? (strtolower($this->in('Install Subdomains Plugin?', ['y', 'n'])) == 'y') : (strtolower($this->in('Update Configuration?', ['y', 'n'])) == 'y'))) {
 			
 			do {
 				
@@ -60,7 +60,7 @@ 
 					
 					$this->out();
 					
-					if (strtolower($this->in('Add Another Subdomain?', ['y','n'])) == 'n') {
+					if (strtolower($this->in('Add Another Subdomain?', ['y', 'n'])) == 'n') {
 						$addMore = false;
 					}
 									
@@ -81,13 +81,13 @@ 
 							$subdomains[] = $subdomain;
 							$valid = true;
 							$this->out();
-						}else{
+						} else {
 							$valid = false;
 							$this->out();
 							$this->_io->out('<error>Invalid Subdomain.</error>');
 						}
 						
-					} while (!$valid || strtolower($this->in('Add Another Subdomain?', ['y','n'])) == 'y');
+					} while (!$valid || strtolower($this->in('Add Another Subdomain?', ['y', 'n'])) == 'y');
 					
 				}
 				
@@ -106,14 +106,14 @@ 
 				
 				$this->out();
 							
-				while (count($subdomains) > 0 && strtolower($this->in('Delete a Subdomain?', ['y','n'])) == 'y') {
+				while (count($subdomains) > 0 && strtolower($this->in('Delete a Subdomain?', ['y', 'n'])) == 'y') {
 					
 					$this->out();
 					$deleteKey = (int) $this->in('Enter Number to Delete:', array_keys($subdomains));
 					
 					if (isset($subdomains[$deleteKey])) {
 						$this->out();
-						$this->out('Deleted: ' .  $subdomains[$deleteKey], 2);
+						$this->out('Deleted: ' . $subdomains[$deleteKey], 2);
 						unset($subdomains[$deleteKey]);	
 					}
 					
@@ -127,10 +127,10 @@ 
 					$this->_io->out('<error>No Subdomains Configured.</error>', 2);					
 				}
 				
-			} while (count($subdomains) == 0 && strtolower($this->in('Start Over?', ['y','n'])) == 'y');
+			} while (count($subdomains) == 0 && strtolower($this->in('Start Over?', ['y', 'n'])) == 'y');
 			
 			$this->out();
-			if(count($subdomains) > 0) {
+			if (count($subdomains) > 0) {
 				$this->out('Configuration Saved!', 2);
 			} else {
 				$this->_io->out('<error>Plugin Not Currently Active.</error>', 2);	
@@ -141,7 +141,7 @@ 
 	
 	private function _modifyArray(array $array) {
 
-		return array_combine(range(1, count($array)), array_values($array));;	
+		return array_combine(range(1, count($array)), array_values($array)); ;	
 		
 	}
 	  

Braces +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 							$subdomains[] = $subdomain;
 							$valid = true;
 							$this->out();
-						}else{
+						} else{
 							$valid = false;
 							$this->out();
 							$this->_io->out('<error>Invalid Subdomain.</error>');

Indentation +79 added lines, -79 removed lines

@@ -21,129 +21,129 @@
 
 class SubdomainsInstallShell extends Shell {
     
-	public function main() {
+    public function main() {
 	
-		$subdomains = array();	
+        $subdomains = array();	
 	
-	    $this->clear();
+        $this->clear();
 		
-		$this->_io->styles('error', ['text' => 'red']);
+        $this->_io->styles('error', ['text' => 'red']);
         $this->helper('Multidimensional/Subdomains.Header')->output();
     
         $first_run = Configure::check('Multidimensional/Subdomains.subdomains') ? false : true;
 		
-		if ($first_run == false) {
+        if ($first_run == false) {
 			
-			$subdomains = Configure::consume('Multidimensional/Subdomains.subdomains');
+            $subdomains = Configure::consume('Multidimensional/Subdomains.subdomains');
 			
-			if (count($subdomains) == 0) {
-				$first_run = true;
-			}
+            if (count($subdomains) == 0) {
+                $first_run = true;
+            }
 			
-		}
+        }
 	   
         if ((($first_run) ? (strtolower($this->in('Install Subdomains Plugin?', ['y','n'])) == 'y') : (strtolower($this->in('Update Configuration?', ['y','n'])) == 'y'))) {
 			
-			do {
+            do {
 				
-				$this->out();
+                $this->out();
 				
-				$addMore = true;
+                $addMore = true;
 				
-				if ($first_run === false && count($subdomains) > 0) {
+                if ($first_run === false && count($subdomains) > 0) {
 				
-					$this->out('Current Subdomains:', 2);	
+                    $this->out('Current Subdomains:', 2);	
 								
-					foreach ($subdomains AS $prefix) {
-						$this->out(' - ' . $prefix);	
-					}
+                    foreach ($subdomains AS $prefix) {
+                        $this->out(' - ' . $prefix);	
+                    }
 					
-					$this->out();
+                    $this->out();
 					
-					if (strtolower($this->in('Add Another Subdomain?', ['y','n'])) == 'n') {
-						$addMore = false;
-					}
+                    if (strtolower($this->in('Add Another Subdomain?', ['y','n'])) == 'n') {
+                        $addMore = false;
+                    }
 									
-				}
+                }
 				
-				if ($addMore) {
+                if ($addMore) {
 						
-					if (count($subdomains) == 0) {
-						$this->out('Add Your First Subdomain.');
-					}
+                    if (count($subdomains) == 0) {
+                        $this->out('Add Your First Subdomain.');
+                    }
 						
-					do {
+                    do {
 						
-						$valid = true;
-						$this->out();
-						$subdomain = $this->in('Subdomain:');
-						if (preg_match('/^[A-Za-z0-9]{1}(?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9]{1})?$/', $subdomain, $matches)) {
-							$subdomains[] = $subdomain;
-							$valid = true;
-							$this->out();
-						}else{
-							$valid = false;
-							$this->out();
-							$this->_io->out('<error>Invalid Subdomain.</error>');
-						}
+                        $valid = true;
+                        $this->out();
+                        $subdomain = $this->in('Subdomain:');
+                        if (preg_match('/^[A-Za-z0-9]{1}(?:[A-Za-z0-9\-]{0,61}[A-Za-z0-9]{1})?$/', $subdomain, $matches)) {
+                            $subdomains[] = $subdomain;
+                            $valid = true;
+                            $this->out();
+                        }else{
+                            $valid = false;
+                            $this->out();
+                            $this->_io->out('<error>Invalid Subdomain.</error>');
+                        }
 						
-					} while (!$valid || strtolower($this->in('Add Another Subdomain?', ['y','n'])) == 'y');
+                    } while (!$valid || strtolower($this->in('Add Another Subdomain?', ['y','n'])) == 'y');
 					
-				}
+                }
 				
-				$subdomains = array_values(array_unique($subdomains));
+                $subdomains = array_values(array_unique($subdomains));
 				
-				$subdomains = $this->_modifyArray($subdomains);
+                $subdomains = $this->_modifyArray($subdomains);
 				
-				$this->out();
-				$this->out('Current Subdomains:', 2);
+                $this->out();
+                $this->out('Current Subdomains:', 2);
 				
-				if (count($subdomains) > 0) {
-					foreach ($subdomains AS $key => $value) {
-						$this->out(' ' . ($key) . '. ' . $value);	
-					}				
-				}
+                if (count($subdomains) > 0) {
+                    foreach ($subdomains AS $key => $value) {
+                        $this->out(' ' . ($key) . '. ' . $value);	
+                    }				
+                }
 				
-				$this->out();
+                $this->out();
 							
-				while (count($subdomains) > 0 && strtolower($this->in('Delete a Subdomain?', ['y','n'])) == 'y') {
+                while (count($subdomains) > 0 && strtolower($this->in('Delete a Subdomain?', ['y','n'])) == 'y') {
 					
-					$this->out();
-					$deleteKey = (int) $this->in('Enter Number to Delete:', array_keys($subdomains));
+                    $this->out();
+                    $deleteKey = (int) $this->in('Enter Number to Delete:', array_keys($subdomains));
 					
-					if (isset($subdomains[$deleteKey])) {
-						$this->out();
-						$this->out('Deleted: ' .  $subdomains[$deleteKey], 2);
-						unset($subdomains[$deleteKey]);	
-					}
+                    if (isset($subdomains[$deleteKey])) {
+                        $this->out();
+                        $this->out('Deleted: ' .  $subdomains[$deleteKey], 2);
+                        unset($subdomains[$deleteKey]);	
+                    }
 					
-				}
+                }
 				
-				Configure::write('Multidimensional/Subdomains.subdomains', array_values($subdomains));
-				Configure::dump('subdomains', 'default', ['Multidimensional/Subdomains']);
+                Configure::write('Multidimensional/Subdomains.subdomains', array_values($subdomains));
+                Configure::dump('subdomains', 'default', ['Multidimensional/Subdomains']);
 				
-				if (count($subdomains) == 0) {
-					$this->out();
-					$this->_io->out('<error>No Subdomains Configured.</error>', 2);					
-				}
+                if (count($subdomains) == 0) {
+                    $this->out();
+                    $this->_io->out('<error>No Subdomains Configured.</error>', 2);					
+                }
 				
-			} while (count($subdomains) == 0 && strtolower($this->in('Start Over?', ['y','n'])) == 'y');
+            } while (count($subdomains) == 0 && strtolower($this->in('Start Over?', ['y','n'])) == 'y');
 			
-			$this->out();
-			if(count($subdomains) > 0) {
-				$this->out('Configuration Saved!', 2);
-			} else {
-				$this->_io->out('<error>Plugin Not Currently Active.</error>', 2);	
-			}
-		}
+            $this->out();
+            if(count($subdomains) > 0) {
+                $this->out('Configuration Saved!', 2);
+            } else {
+                $this->_io->out('<error>Plugin Not Currently Active.</error>', 2);	
+            }
+        }
 	
-	}
+    }
 	
-	private function _modifyArray(array $array) {
+    private function _modifyArray(array $array) {
 
-		return array_combine(range(1, count($array)), array_values($array));;	
+        return array_combine(range(1, count($array)), array_values($array));;	
 		
-	}
+    }
 	  
 	  
 }
\ No newline at end of file

config/subdomains.default.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  *  If you don't have this file, copy it to your main CakePHP config folder.
 /*/
 
-return array (
+return array(
   'Multidimensional/Subdomains' => 
     array('subdomains' =>
 		array('{SUBDOMAIN_1}', '{SUBDOMAIN_2}', ... '{SUBDOMAIN_N}')

Indentation +3 added lines, -3 removed lines

@@ -23,8 +23,8 @@
 /*/
 
 return array (
-  'Multidimensional/Subdomains' => 
+    'Multidimensional/Subdomains' => 
     array('subdomains' =>
-		array('{SUBDOMAIN_1}', '{SUBDOMAIN_2}', ... '{SUBDOMAIN_N}')
-	)
+        array('{SUBDOMAIN_1}', '{SUBDOMAIN_2}', ... '{SUBDOMAIN_N}')
+    )
 );
\ No newline at end of file

config/routes.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 	$subdomains = Configure::read('Multidimensional/Subdomains.subdomains');
 	
-	if(is_array($subdomains)) {
+	if (is_array($subdomains)) {
 		
 		foreach ($subdomains AS $prefix) {
 			

Indentation +9 added lines, -9 removed lines

@@ -22,18 +22,18 @@
 
 if ($validConfiguration) {
 
-	$subdomains = Configure::read('Multidimensional/Subdomains.subdomains');
+    $subdomains = Configure::read('Multidimensional/Subdomains.subdomains');
 	
-	if(is_array($subdomains)) {
+    if(is_array($subdomains)) {
 		
-		foreach ($subdomains AS $prefix) {
+        foreach ($subdomains AS $prefix) {
 			
-			Router::scope('/', ['prefix' => $prefix], function($routes) { 
-				$routes->fallbacks('InflectedRoute');
-			});
+            Router::scope('/', ['prefix' => $prefix], function($routes) { 
+                $routes->fallbacks('InflectedRoute');
+            });
 			
-		}
+        }
 	
-	}
+    }
 	
-	}
\ No newline at end of file
+    }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 		
 		foreach ($subdomains AS $prefix) {
 			
-			Router::scope('/', ['prefix' => $prefix], function($routes) { 
+			Router::scope('/', ['prefix' => $prefix], function($routes) {
 				$routes->fallbacks('InflectedRoute');
 			});
 			

config/bootstrap.php

Indentation +2 added lines, -2 removed lines

@@ -25,9 +25,9 @@
 $subdomainConfig = array('subdomains' => NULL);
 
 if (file_exists(CONFIG . 'subdomains.php')) {
-  Configure::load('subdomains');
+    Configure::load('subdomains');
 } else {
-  Configure::write('Multidimensional/Subdomains', $subdomainConfig);
+    Configure::write('Multidimensional/Subdomains', $subdomainConfig);
 }
 
 ?>
\ No newline at end of file

src/Routing/Route/DashedRoute.php

Braces +1 added lines, -2 removed lines

@@ -18,7 +18,6 @@
 use Cake\Routing\Route\DashedRoute as CakeDashedRoute;
 use Multidimensional\Subdomains\Routing\SubdomainRouteTrait;
 
-class DashedRoute extends CakeDashedRoute
-{
+class DashedRoute extends CakeDashedRoute {
     use SubdomainRouteTrait;
 }
\ No newline at end of file

src/Routing/Route/Route.php

Braces +1 added lines, -2 removed lines

@@ -18,7 +18,6 @@
 use Cake\Routing\Route\Route as CakeRoute;
 use Multidimensional\Subdomains\Routing\SubdomainRouteTrait;
 
-class Route extends CakeRoute
-{
+class Route extends CakeRoute {
     use SubdomainRouteTrait;
 }
\ No newline at end of file

src/Routing/Route/InflectedRoute.php

Braces +1 added lines, -2 removed lines

@@ -18,7 +18,6 @@
 use Cake\Routing\Route\InflectedRoute as CakeInflectedRoute;
 use Multidimensional\Subdomains\Routing\SubdomainRouteTrait;
 
-class InflectedRoute extends CakeInflectedRoute
-{
+class InflectedRoute extends CakeInflectedRoute {
     use SubdomainRouteTrait;
 }
\ No newline at end of file

src/Shell/Helper/HeaderHelper.php

Indentation +3 added lines, -3 removed lines

@@ -25,9 +25,9 @@
         $this->_io->styles('header', ['text' => 'green']);
 
         $this->_io->out('<header>   ______  _____  ___  ____  __  ______   _____  ______</header>');
-		$this->_io->out('<header>  / __/ / / / _ )/ _ \/ __ \/  |/  / _ | /  _/ |/ / __/</header>');
-		$this->_io->out('<header> _\ \/ /_/ / _  / // / /_/ / /|_/ / __ |_/ //    /\ \  </header>');
-		$this->_io->out('<header>/___/\____/____/____/\____/_/  /_/_/ |_/___/_/|_/___/  </header>');
+        $this->_io->out('<header>  / __/ / / / _ )/ _ \/ __ \/  |/  / _ | /  _/ |/ / __/</header>');
+        $this->_io->out('<header> _\ \/ /_/ / _  / // / /_/ / /|_/ / __ |_/ //    /\ \  </header>');
+        $this->_io->out('<header>/___/\____/____/____/\____/_/  /_/_/ |_/___/_/|_/___/  </header>');
         $this->_io->out("\n");
         $this->_io->out('<header>              CakePHP : Subdomains Router              </header>');
         $this->_io->out('<header>              by https://multidimension.al             </header>');

Braces +2 added lines, -4 removed lines

@@ -17,10 +17,8 @@
 
 use Cake\Console\Helper;
 
-class HeaderHelper extends Helper
-{
-    public function output($args = null)
-    {
+class HeaderHelper extends Helper {
+    public function output($args = null) {
         $this->_io->out("\n\n");
         $this->_io->styles('header', ['text' => 'green']);