php-resta / resta-core

src/resta/Console/Source/Repository/Repository.php

Spacing +19 added lines, -19 removed lines

@@ -14,7 +14,7 @@ 
     /**

      * @var $type

      */

-    public $type='repository';

+    public $type = 'repository';

 

     /**

      * @var array

@@ -31,39 +31,39 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['repository','?source'];

+    public $commandRule = ['repository', '?source'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

-        $repository=$this->argument['repository'];

+        $repository = $this->argument['repository'];

 

-        $repositoryPath=$this->repository().'/'.$repository;

+        $repositoryPath = $this->repository().'/'.$repository;

 

-        $this->argument['repositoryNamespace']=Utils::getNamespace($repositoryPath);

+        $this->argument['repositoryNamespace'] = Utils::getNamespace($repositoryPath);

 

-        if($this->sourceCreate()) return true;

+        if ($this->sourceCreate()) return true;

 

         $this->directory['repositoryPath'] = $this->repository();

-        $this->directory['repositoryDir']=$repositoryPath;

+        $this->directory['repositoryDir'] = $repositoryPath;

 

-        $this->directory['repositorySourceDir']=$this->repository().'/'.$repository.'/Source';

-        $this->directory['repositorySourceMainDir']=$this->directory['repositorySourceDir'].'/Main';

+        $this->directory['repositorySourceDir'] = $this->repository().'/'.$repository.'/Source';

+        $this->directory['repositorySourceMainDir'] = $this->directory['repositorySourceDir'].'/Main';

 

         //set project directory

         $this->file->makeDirectory($this);

 

-        $this->touch['repository/adapter']      =$this->directory['repositoryDir'].'/'.$repository.'Adapter.php';

-        $this->touch['repository/contract']     =$this->directory['repositoryDir'].'/'.$repository.'Contract.php';

+        $this->touch['repository/adapter']      = $this->directory['repositoryDir'].'/'.$repository.'Adapter.php';

+        $this->touch['repository/contract']     = $this->directory['repositoryDir'].'/'.$repository.'Contract.php';

         //$this->touch['repository/trait']        =$this->directory['repositoryDir'].'/'.$repository.'Trait.php';

 

-        $this->touch['repository/sourcemain']       =$this->directory['repositorySourceMainDir'].'/'.$repository.'Main.php';

+        $this->touch['repository/sourcemain'] = $this->directory['repositorySourceMainDir'].'/'.$repository.'Main.php';

 

         //set project touch

-        $this->file->touch($this,[

+        $this->file->touch($this, [

             'stub'=>'Repository_Create'

         ]);

         

@@ -77,16 +77,16 @@ 
     /**

      * @return bool

      */

-    private function sourceCreate(){

+    private function sourceCreate() {

 

-        if(isset($this->argument['source'])){

+        if (isset($this->argument['source'])) {

 

-            $this->directory['repositorySourceCustomDir']=$this->repository().'/'.$this->argument['repository'].'/Source/'.$this->argument['source'];

+            $this->directory['repositorySourceCustomDir'] = $this->repository().'/'.$this->argument['repository'].'/Source/'.$this->argument['source'];

 

             //set project directory

             $this->file->makeDirectory($this);

 

-            $this->touch['repository/sourcecustommain']=$this->directory['repositorySourceCustomDir'].'/'.$this->argument['repository'].''.$this->argument['source'].'.php';

+            $this->touch['repository/sourcecustommain'] = $this->directory['repositorySourceCustomDir'].'/'.$this->argument['repository'].''.$this->argument['source'].'.php';

 

             //set project touch

             $this->file->touch($this);

@@ -102,7 +102,7 @@ 
     /**

      * @return bool

      */

-    private function setAnnotations(){

+    private function setAnnotations() {

 

         return Utils::changeClass(path()->version().'/ServiceAnnotationsManager.php',

             ['Trait ServiceAnnotationsManager'=>'Trait ServiceAnnotationsManager'.PHP_EOL.' * @method \\'.app()->namespace()->repository().'\\'.$this->argument['repository'].'\\'.$this->argument['repository'].'Contract '.lcfirst($this->argument['repository']).'Repository'

Braces +3 added lines, -1 removed lines

@@ -45,7 +45,9 @@
 

         $this->argument['repositoryNamespace']=Utils::getNamespace($repositoryPath);

 

-        if($this->sourceCreate()) return true;

+        if($this->sourceCreate()) {

+            return true;

+        }

 

         $this->directory['repositoryPath'] = $this->repository();

         $this->directory['repositoryDir']=$repositoryPath;

src/resta/Console/Source/Factory/Factory.php

Spacing +13 added lines, -13 removed lines

@@ -15,7 +15,7 @@ 
     /**

      * @var $type

      */

-    public $type='factory';

+    public $type = 'factory';

 

     /**

      * @var array

@@ -32,7 +32,7 @@ 
     /**

      * @var $commandRule

      */

-    protected $commandRule=[[

+    protected $commandRule = [[

         'create'=>[]

     ]];

 

@@ -54,21 +54,21 @@ 
 

         $this->file->makeDirectory($this);

 

-        if(!file_exists($this->factory().'/Factory.php')){

+        if (!file_exists($this->factory().'/Factory.php')) {

 

             $this->touch['factory/factory']             = $this->factory().'/Factory.php';

             $this->touch['factory/factorymanager']      = $this->factory().'/FactoryManager.php';

         }

 

-        if(file_exists( $this->directory['factoryArgumentDir'])){

+        if (file_exists($this->directory['factoryArgumentDir'])) {

 

             $factoryargumentmanager = $this->directory['factoryArgumentDir'].'/'.$factoryArgument.'Manager.php';

             $factoryargumentmanagerInterface = $this->directory['factoryArgumentDirInterfaces'].'/'.$factoryArgument.'Interface.php';

 

-            if(!file_exists($this->directory['factoryArgumentDir'].'/'.$factoryArgument.'Manager.php')){

+            if (!file_exists($this->directory['factoryArgumentDir'].'/'.$factoryArgument.'Manager.php')) {

 

-                $this->touch['factory/factoryargumentmanager'] =   $factoryargumentmanager;

-                $this->touch['factory/factoryargumentmanagerinterface']     = $factoryargumentmanagerInterface;

+                $this->touch['factory/factoryargumentmanager'] = $factoryargumentmanager;

+                $this->touch['factory/factoryargumentmanagerinterface'] = $factoryargumentmanagerInterface;

                 $this->touch['factory/index'] = $this->directory['factoryArgumentDirResources'].'/index.html';

 

                 $this->file->touch($this);

@@ -78,9 +78,9 @@ 
 {'=>'class Factory extends FactoryManager

 {

     /**

-     * @return '.$factoryArgument .'Interface

+     * @return '.$factoryArgument.'Interface

      */

-    public static function '.strtolower($factoryArgument ).'() : '.$factoryArgument.'Interface

+    public static function '.strtolower($factoryArgument).'() : '.$factoryArgument.'Interface

     {

         return static::singleton('.$factoryArgument.'Manager::class);

     }

@@ -96,15 +96,15 @@ 
                     ]);

             }

 

-            if(isset($this->argument['resource'])){

+            if (isset($this->argument['resource'])) {

                 $resourceArgument = $this->argument['resource'];

 

-                if($resourceArgument!==null){

+                if ($resourceArgument!==null) {

                     $factoryArgumentResourceDir = $this->directory['factoryArgumentDir'].''.DIRECTORY_SEPARATOR.'Resources';

-                    $this->directory['factoryArgumentResourceArgumentDir']  =$factoryArgumentResourceDir.''.DIRECTORY_SEPARATOR.''.$resourceArgument;

+                    $this->directory['factoryArgumentResourceArgumentDir'] = $factoryArgumentResourceDir.''.DIRECTORY_SEPARATOR.''.$resourceArgument;

                     $this->file->makeDirectory($this);

 

-                    if(!file_exists($this->directory['factoryArgumentResourceArgumentDir'].''.DIRECTORY_SEPARATOR.''.$resourceArgument.'.php')){

+                    if (!file_exists($this->directory['factoryArgumentResourceArgumentDir'].''.DIRECTORY_SEPARATOR.''.$resourceArgument.'.php')) {

 

                         $this->touch['factory/factoryargumentresource']             = $this->directory['factoryArgumentResourceArgumentDir'].''.DIRECTORY_SEPARATOR.''.$resourceArgument.'.php';

                         $this->touch['factory/factoryargumentresourceinterface']    = $this->directory['factoryArgumentDirInterfaces'].'/'.$resourceArgument.'Interface.php';

src/resta/Console/Source/Autoservice/Autoservice.php

Spacing +8 added lines, -8 removed lines

@@ -14,7 +14,7 @@ 
     /**

      * @var $type

      */

-    public $type='auto-service';

+    public $type = 'auto-service';

 

     /**

      * @var array

@@ -26,24 +26,24 @@ 
     /**

      * @var $commandRule

      */

-    protected $commandRule=[];

+    protected $commandRule = [];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

-        $autoDirectory=explode("\\",$this->argument['project']);

+        $autoDirectory = explode("\\", $this->argument['project']);

 

-        $this->argument['autoservice']=$autoDirectory[0];

+        $this->argument['autoservice'] = $autoDirectory[0];

 

         $this->argument['methodPrefix'] = StaticPathModel::$methodPrefix;

-        $this->directory['path']    = $this->autoService().'/'.$autoDirectory[0];

+        $this->directory['path'] = $this->autoService().'/'.$autoDirectory[0];

 

-        $this->file->makeDirectory($this,true);

+        $this->file->makeDirectory($this, true);

 

-        $this->touch['service/autoendpoint']        = $this->directory['path'].'/'.$autoDirectory[0].'Service.php';

+        $this->touch['service/autoendpoint'] = $this->directory['path'].'/'.$autoDirectory[0].'Service.php';

 

         $this->file->touch($this);

 

src/resta/Console/Source/Route/Route.php

Braces +1 added lines, -2 removed lines

@@ -100,8 +100,7 @@
                         true

                     ]);

                 }

-            }

-            else{

+            } else{

 

                 $this->table->addRow([

                     ++$counter,

Spacing +19 added lines, -19 removed lines

@@ -16,7 +16,7 @@ 
     /**

      * @var $type

      */

-    public $type='route';

+    public $type = 'route';

 

     /**

      * @var array

@@ -33,7 +33,7 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=[];

+    public $commandRule = [];

 

     /**

      * @return bool

@@ -42,24 +42,24 @@ 
 

         echo $this->info('All Route Controller Lists :');

 

-        $this->table->setHeaders(['no','endpoint','http','method','definition','beforeMiddleware','afterMiddleware','routeCache','doc','status']);

+        $this->table->setHeaders(['no', 'endpoint', 'http', 'method', 'definition', 'beforeMiddleware', 'afterMiddleware', 'routeCache', 'doc', 'status']);

 

         $routes = Router::getRoutes();

         $routeData = isset($routes['data']) ? $routes['data'] : [];

         $routePattern = isset($routes['pattern']) ? $routes['pattern'] : [];

 

-        $counter=0;

+        $counter = 0;

 

         $application = app();

 

         $application->loadIfNotExistBoot(['middleware']);

         $middlewareProvider = $application['middleware'];

 

-        foreach($routeData as $key=>$data){

+        foreach ($routeData as $key=>$data) {

 

-            $middlewareProvider->setKeyOdds('endpoint',$data['endpoint']);

-            $middlewareProvider->setKeyOdds('method',$data['method']);

-            $middlewareProvider->setKeyOdds('http',$data['http']);

+            $middlewareProvider->setKeyOdds('endpoint', $data['endpoint']);

+            $middlewareProvider->setKeyOdds('method', $data['method']);

+            $middlewareProvider->setKeyOdds('http', $data['http']);

 

             $middlewareProvider->handleMiddlewareProcess();

             $beforeMiddleware = $middlewareProvider->getShow();

@@ -76,22 +76,22 @@ 
             $reflection = app()['reflection']($controllerNamespace);

             $methodDocument = $reflection->reflectionMethodParams($data['method'])->document;

 

-            $isRouteCache = ($reflection->isAvailableMethodDocument($data['method'],'cache')) ?

+            $isRouteCache = ($reflection->isAvailableMethodDocument($data['method'], 'cache')) ?

                 'available' : '';

 

             $methodDefinition = '';

 

-            if(preg_match('@#define:(.*?)\n@is',$methodDocument,$definition)){

-                if(isset($definition[1])){

+            if (preg_match('@#define:(.*?)\n@is', $methodDocument, $definition)) {

+                if (isset($definition[1])) {

                     $methodDefinition = rtrim($definition[1]);

                 }

             }

 

-            $endpointData = $endpoint.'/'.implode("/",$routePattern[$key]);

+            $endpointData = $endpoint.'/'.implode("/", $routePattern[$key]);

 

-            if(isset($this->argument['filter'])){

+            if (isset($this->argument['filter'])) {

 

-                if(preg_match('@'.$this->argument['filter'].'@is',$endpointData)){

+                if (preg_match('@'.$this->argument['filter'].'@is', $endpointData)) {

 

                     $this->table->addRow([

                         ++$counter,

@@ -100,8 +100,8 @@ 
                         //$controllerNamespace,

                         $data['method'],

                         $methodDefinition,

-                        implode(",",$beforeMiddleware),

-                        implode(",",$afterMiddleware),

+                        implode(",", $beforeMiddleware),

+                        implode(",", $afterMiddleware),

                         $isRouteCache,

                         '',

                         '',

@@ -109,7 +109,7 @@ 
                     ]);

                 }

             }

-            else{

+            else {

 

                 $this->table->addRow([

                     ++$counter,

@@ -118,8 +118,8 @@ 
                     //$controllerNamespace,

                     $data['method'],

                     $methodDefinition,

-                    implode(",",$beforeMiddleware),

-                    implode(",",$afterMiddleware),

+                    implode(",", $beforeMiddleware),

+                    implode(",", $afterMiddleware),

                     $isRouteCache,

                     '',

                     true

src/resta/Console/Source/Request/Request.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
     /**

      * @var $type

      */

-    public $type='request';

+    public $type = 'request';

 

     /**

      * @var array

@@ -32,15 +32,15 @@ 
     /**

      * @var $commandRule

      */

-    public $commandRule=['request'];

+    public $commandRule = ['request'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

-        $request=$this->argument['request'];

+        $request = $this->argument['request'];

 

 

         $this->directory['requestCreate']   = path()->request();

@@ -50,12 +50,12 @@ 
         //set project directory

         $this->file->makeDirectory($this);

 

-        if(!file_exists($this->directory['requestCreate'].'/Request.php')){

+        if (!file_exists($this->directory['requestCreate'].'/Request.php')) {

             $this->touch['source/request'] = $this->directory['requestCreate'].'/Request.php';

             $this->touch['source/requestGenerator'] = $this->directory['requestCreate'].'/RequestGenerator.php';

         }

 

-        if(!file_exists($this->directory['requestCreate'].'/RequestProvider.php')){

+        if (!file_exists($this->directory['requestCreate'].'/RequestProvider.php')) {

             $this->touch['source/requestProvider'] = $this->directory['requestCreate'].'/RequestProvider.php';

         }

 

src/resta/Console/Source/Command/Command.php

Spacing +4 added lines, -4 removed lines

@@ -13,7 +13,7 @@ 
     /**

      * @var $type

      */

-    public $type='command';

+    public $type = 'command';

 

     /**

      * @var array

@@ -25,13 +25,13 @@ 
     /**

      * @var $commandRule

      */

-    protected $commandRule=['command'];

+    protected $commandRule = ['command'];

 

     /**

      * @method create

      * @return mixed

      */

-    public function create(){

+    public function create() {

 

         $this->directory['commandDir'] = path()->command();

         $this->argument['commandNamespace'] = app()->namespace()->command();

@@ -40,7 +40,7 @@ 
         //set project directory

         $this->file->makeDirectory($this);

 

-        $this->touch['command/file']        = $this->directory['commandDir'].'/'.$this->argument['command'].'.php';

+        $this->touch['command/file'] = $this->directory['commandDir'].'/'.$this->argument['command'].'.php';

 

         $this->file->touch($this);

 

src/resta/Console/ConsoleOutputter.php

Braces +1 added lines, -2 removed lines

@@ -155,8 +155,7 @@
 

         if(isset($this->argument['group'])){

             $argument=current($dataParse).''.$seperate.''.$this->argument['group'];

-        }

-        else{

+        } else{

             $argument=current($dataParse);

         }

 

Spacing +16 added lines, -16 removed lines

@@ -63,7 +63,7 @@ 
      * @param $argument

      * @param $app

      */

-    public function __construct($argument,$app) {

+    public function __construct($argument, $app) {

 

         // Set up shell colors

         $this->foreground_colors['black'] = '0;30';

@@ -99,7 +99,7 @@ 
         $this->table = new \console_table();

 

 

-        if(isset($this->argument['project'])){

+        if (isset($this->argument['project'])) {

 

             $this->argument['repositoryNamespace']  = app()->namespace()->repository();

             $this->argument['modelNamespace']       = app()->namespace()->model();

@@ -110,7 +110,7 @@ 
             $this->argument['project'] = $this->argument['project'].'\\'.StaticPathList::$projectPrefixGroup;

 

 

-            $this->project = StaticPathModel::appPath().'/'.str_replace('\\','/',$this->argument['project']);

+            $this->project = StaticPathModel::appPath().'/'.str_replace('\\', '/', $this->argument['project']);

 

 

         }

@@ -127,11 +127,11 @@ 
         return array_keys($this->background_colors);

     }

 

-    public function ReadStdin($prompt=null, $valid_inputs=null, $default = '') {

-        while(!isset($input) || (is_array($valid_inputs) && !in_array($input, $valid_inputs)) || ($valid_inputs == 'is_file' && !is_file($input))) {

+    public function ReadStdin($prompt = null, $valid_inputs = null, $default = '') {

+        while (!isset($input) || (is_array($valid_inputs) && !in_array($input, $valid_inputs)) || ($valid_inputs=='is_file' && !is_file($input))) {

             echo $this->input($prompt);

             $input = strtolower(trim(fgets(STDIN)));

-            if(empty($input) && !empty($default)) {

+            if (empty($input) && !empty($default)) {

                 $input = $default;

             }

         }

@@ -142,7 +142,7 @@ 
      * @param array $commander

      * @return mixed|string

      */

-    public function exception($commander=array()){

+    public function exception($commander = array()) {

         return $this->error('[['.$commander['argument'].']] parameter is missing for commander');

     }

 

@@ -151,15 +151,15 @@ 
      * @param string $seperate

      * @return mixed|string

      */

-    public function checkGroupArgument($data,$seperate="\\"){

+    public function checkGroupArgument($data, $seperate = "\\") {

 

-        $dataParse=explode("\\",$data);

+        $dataParse = explode("\\", $data);

 

-        if(isset($this->argument['group'])){

-            $argument=current($dataParse).''.$seperate.''.$this->argument['group'];

+        if (isset($this->argument['group'])) {

+            $argument = current($dataParse).''.$seperate.''.$this->argument['group'];

         }

-        else{

-            $argument=current($dataParse);

+        else {

+            $argument = current($dataParse);

         }

 

         return $argument;

@@ -168,12 +168,12 @@ 
     /**

      * @param $string

      */

-    public function consoleLogger($string,$level)

+    public function consoleLogger($string, $level)

     {

-        if(config('app')!==null && config('app.consoleLogger')){

+        if (config('app')!==null && config('app.consoleLogger')) {

 

             logger('console')->{$level}([

-                'argument'  => implode(" ",core()->consoleArguments),

+                'argument'  => implode(" ", core()->consoleArguments),

                 'result'    => $string,

             ]);

         }

src/resta/Console/ConsoleBindings.php

Spacing +11 added lines, -11 removed lines

@@ -20,12 +20,12 @@ 
      * @method bindConsoleShared

      * @return array

      */

-    private function bindConsoleShared(){

+    private function bindConsoleShared() {

 

         //We assign the values assigned to the console object to the bindings array.

         //The console object represents the classes to be bound for the kernel object console.

         //if the array returns false on an if condition, the array will be automatically detected as empty.

-        if(isset($this->app['consoleShared']) and is_array($this->app['consoleShared'])){

+        if (isset($this->app['consoleShared']) and is_array($this->app['consoleShared'])) {

             return $this->app['consoleShared'];

         }

         return [];

@@ -36,7 +36,7 @@ 
      * @param $container

      * @return void

      */

-    public function bindForAppCommand($object,$container){

+    public function bindForAppCommand($object, $container) {

 

         //We need a definition of the application name from the data supplied with the console variables.

         //The specified app variable is important to us in the command that is run in the application.

@@ -54,8 +54,8 @@ 
         //we send the value to the bind method without callback after checking the bind object to be loaded for the console.

         //This is the value found in the bindings variable.

         //Thus, we get the binding objects required for the console independently of the http method installation.

-        if(isset($this->bindings[$object])){

-            $this->app->{$appresolve}($object,$this->bindings[$object]);

+        if (isset($this->bindings[$object])) {

+            $this->app->{$appresolve}($object, $this->bindings[$object]);

         }

     }

 

@@ -64,25 +64,25 @@ 
      * @param $callback

      * @param $container

      */

-    public function console($object,$callback,$container){

+    public function console($object, $callback, $container) {

 

         //If the console argument is an operator that exists in the resta kernel,

         //we run a callback method to check it. The bindings for the custom application commander will be run.

-        $this->bindForAppCommand($object,$container);

+        $this->bindForAppCommand($object, $container);

 

         //closure object

         $callBackResolve = Utils::callbackProcess($callback);

 

         // if the callbackresolve variable represents a class,

         // we directly register it's resolved status to the container object.

-        if(Utils::isNamespaceExists($callBackResolve)){

-            $this->app->register($object,$this->app->resolve(Utils::callbackProcess($callback)));

+        if (Utils::isNamespaceExists($callBackResolve)) {

+            $this->app->register($object, $this->app->resolve(Utils::callbackProcess($callback)));

         }

-        else{

+        else {

 

             // if callbackresolve doesn't represent a class,

             // we're register it's no resolved status.

-            $this->app->register($object,Utils::callbackProcess($callback));

+            $this->app->register($object, Utils::callbackProcess($callback));

         }

 

 

Braces +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
         // we directly register it's resolved status to the container object.

         if(Utils::isNamespaceExists($callBackResolve)){

             $this->app->register($object,$this->app->resolve(Utils::callbackProcess($callback)));

-        }

-        else{

+        } else{

 

             // if callbackresolve doesn't represent a class,

             // we're register it's no resolved status.

src/resta/Console/Color.php

Indentation +2 added lines, -2 removed lines

@@ -217,7 +217,7 @@ 
     function convert($string, $colored = true)

     {

         static $conversions = array ( // static so the array doesn't get built

-                                      // everytime

+                                        // everytime

             // %y - yellow, and so on... {{{

             '%y' => array('color' => 'yellow'),

             '%g' => array('color' => 'green' ),

@@ -260,7 +260,7 @@ 
             $string = str_replace('%%', '% ', $string);

             foreach ($conversions as $key => $value) {

                 $string = str_replace($key, Console_Color::color($value),

-                          $string);

+                            $string);

             }

             $string = str_replace('% ', '%', $string);

 

Spacing +26 added lines, -26 removed lines

@@ -32,7 +32,7 @@ 
  */

 

 

-$GLOBALS['_CONSOLE_COLOR_CODES'] = array (

+$GLOBALS['_CONSOLE_COLOR_CODES'] = array(

     'color' => array(

             'black'  => 30,

             'red'    => 31,

@@ -112,7 +112,7 @@ 
             $color      = @$color['color'];

         }

 

-        if ($color == 'reset') {

+        if ($color=='reset') {

             return "\033[0m";

         }

 

@@ -216,37 +216,37 @@ 
      */

     function convert($string, $colored = true)

     {

-        static $conversions = array ( // static so the array doesn't get built

+        static $conversions = array( // static so the array doesn't get built

                                       // everytime

             // %y - yellow, and so on... {{{

             '%y' => array('color' => 'yellow'),

-            '%g' => array('color' => 'green' ),

-            '%b' => array('color' => 'blue'  ),

-            '%r' => array('color' => 'red'   ),

+            '%g' => array('color' => 'green'),

+            '%b' => array('color' => 'blue'),

+            '%r' => array('color' => 'red'),

             '%p' => array('color' => 'purple'),

             '%m' => array('color' => 'purple'),

-            '%c' => array('color' => 'cyan'  ),

-            '%w' => array('color' => 'grey'  ),

-            '%k' => array('color' => 'black' ),

-            '%n' => array('color' => 'reset' ),

-            '%Y' => array('color' => 'yellow',  'style' => 'light'),

-            '%G' => array('color' => 'green',   'style' => 'light'),

-            '%B' => array('color' => 'blue',    'style' => 'light'),

-            '%R' => array('color' => 'red',     'style' => 'light'),

-            '%P' => array('color' => 'purple',  'style' => 'light'),

-            '%M' => array('color' => 'purple',  'style' => 'light'),

-            '%C' => array('color' => 'cyan',    'style' => 'light'),

-            '%W' => array('color' => 'grey',    'style' => 'light'),

-            '%K' => array('color' => 'black',   'style' => 'light'),

-            '%N' => array('color' => 'reset',   'style' => 'light'),

+            '%c' => array('color' => 'cyan'),

+            '%w' => array('color' => 'grey'),

+            '%k' => array('color' => 'black'),

+            '%n' => array('color' => 'reset'),

+            '%Y' => array('color' => 'yellow', 'style' => 'light'),

+            '%G' => array('color' => 'green', 'style' => 'light'),

+            '%B' => array('color' => 'blue', 'style' => 'light'),

+            '%R' => array('color' => 'red', 'style' => 'light'),

+            '%P' => array('color' => 'purple', 'style' => 'light'),

+            '%M' => array('color' => 'purple', 'style' => 'light'),

+            '%C' => array('color' => 'cyan', 'style' => 'light'),

+            '%W' => array('color' => 'grey', 'style' => 'light'),

+            '%K' => array('color' => 'black', 'style' => 'light'),

+            '%N' => array('color' => 'reset', 'style' => 'light'),

             '%3' => array('background' => 'yellow'),

-            '%2' => array('background' => 'green' ),

-            '%4' => array('background' => 'blue'  ),

-            '%1' => array('background' => 'red'   ),

+            '%2' => array('background' => 'green'),

+            '%4' => array('background' => 'blue'),

+            '%1' => array('background' => 'red'),

             '%5' => array('background' => 'purple'),

-            '%6' => array('background' => 'cyan'  ),

-            '%7' => array('background' => 'grey'  ),

-            '%0' => array('background' => 'black' ),

+            '%6' => array('background' => 'cyan'),

+            '%7' => array('background' => 'grey'),

+            '%0' => array('background' => 'black'),

             // Don't use this, I can't stand flashing text

             '%F' => array('style' => 'blink'),

             '%U' => array('style' => 'underline'),