thinktomorrow / chief

src/Pages/Console/GeneratePage.php

Spacing +17 added lines, -17 removed lines

@@ -37,10 +37,10 @@ 
 
         // Set required paths
         $this->dirs = ['base' => $this->settings['base_path'] ?? base_path()];
-        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'] .'/'. config('thinktomorrow.chief.domain.path', 'src');
-        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'] . '/resources/views';
-        $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'] . '/app/Http/Controllers';
-        $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'] . '/routes/web.php';
+        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'].'/'.config('thinktomorrow.chief.domain.path', 'src');
+        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'].'/resources/views';
+        $this->dirs['controller'] = $this->settings['controller_path'] ?? $this->dirs['base'].'/app/Http/Controllers';
+        $this->files['routes'] = $this->settings['routes_file'] ?? $this->dirs['base'].'/routes/web.php';
     }
 
     public function handle()
@@ -62,8 +62,8 @@ 
     private function publishModel()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/model.php.stub',
-            $to = $this->dirs['model'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/model.php.stub',
+            $to = $this->dirs['model'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'model'
         );
 
@@ -73,8 +73,8 @@ 
     private function publishController()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/controller.php.stub',
-            $to = $this->dirs['controller'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/controller.php.stub',
+            $to = $this->dirs['controller'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'controller'
         );
     }
@@ -113,8 +113,8 @@ 
     private function modelTraits()
     {
         return [
-            '\\' . Publishable::class,
-            '\\' . Sortable::class,
+            '\\'.Publishable::class,
+            '\\'.Sortable::class,
             'q' => 'Proceed.',
         ];
     }
@@ -129,7 +129,7 @@ 
     protected function publishFile($from, $to, $type)
     {
         if ($this->filesystem->exists($to) && !$this->option('force')) {
-            if (!$this->confirm('File [' . $to . '] already exists? Overwrite this file?')) {
+            if (!$this->confirm('File ['.$to.'] already exists? Overwrite this file?')) {
                 return;
             }
         }
@@ -168,7 +168,7 @@ 
 
         $to = str_replace($this->dirs['base'], '', realpath($to));
 
-        $this->line('<info>Copied ' . $type . '</info> <comment>[' . $from . ']</comment> <info>To</info> <comment>[' . $to . ']</comment>');
+        $this->line('<info>Copied '.$type.'</info> <comment>['.$from.']</comment> <info>To</info> <comment>['.$to.']</comment>');
     }
 
     protected function replacePlaceholders($content)
@@ -187,16 +187,16 @@ 
     private function generateImportStatements(): string
     {
         return collect(['\\'.Page::class])
-            ->map(function ($statement) {
-                return 'use ' . $statement . ";\n    ";
+            ->map(function($statement) {
+                return 'use '.$statement.";\n    ";
             })->implode('');
     }
 
     private function generateTraitStatements(): string
     {
         return collect($this->chosenTraits)
-            ->map(function ($statement) {
-                return 'use ' . $statement . ";\n    ";
+            ->map(function($statement) {
+                return 'use '.$statement.";\n    ";
             })->implode('');
     }
 
@@ -215,7 +215,7 @@ 
 
         // We make an estimated guess based on the project name. At Think Tomorrow, we
         // have a src folder which is PSR-4 namespaced by the project name itself.
-        return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')).'\\'. ucfirst($this->plural));
+        return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')).'\\'.ucfirst($this->plural));
     }
 
     private function addToConfig($configKey, $value)

src/Sets/SetReference.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
     {
         // Constraints
         if (!isset($values['action'])) {
-            throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: ' . print_r($values, true));
+            throw new \InvalidArgumentException('Set reference array is missing required values for the "action" keys. Given: '.print_r($values, true));
         }
 
         return new static(
@@ -49,14 +49,14 @@ 
     {
         $sets = config('thinktomorrow.chief.sets', []);
 
-        return collect($sets)->map(function ($set, $key) {
+        return collect($sets)->map(function($set, $key) {
             return SetReference::fromArray($key, $set);
         });
     }
 
     public static function find($key): ?SetReference
     {
-        return static::all()->filter(function ($ref) use ($key) {
+        return static::all()->filter(function($ref) use ($key) {
             return $ref->key() == $key;
         })->first();
     }
@@ -73,9 +73,9 @@ 
 
         $this->validateAction($class, $method);
 
-        $result = call_user_func_array([app($class),$method], $this->parameters);
+        $result = call_user_func_array([app($class), $method], $this->parameters);
 
-        if (! $result instanceof Set && $result instanceof Collection) {
+        if (!$result instanceof Set && $result instanceof Collection) {
             return new Set($result->all(), $this->key);
         }
 
@@ -107,7 +107,7 @@ 
 
     private static function validateAction($class, $method)
     {
-        if (! class_exists($class)) {
+        if (!class_exists($class)) {
             throw new \InvalidArgumentException('The class ['.$class.'] isn\'t a valid class reference or does not exist in the chief-settings.sets config entry.');
         }
 

src/Sets/StoredSetReference.php

Spacing +2 added lines, -2 removed lines

@@ -35,12 +35,12 @@
 
     public function toReference(): SetReference
     {
-        $reference = SetReference::all()->first(function ($setReference) {
+        $reference = SetReference::all()->first(function($setReference) {
             return $setReference->key() == $this->key;
         });
 
         if (!$reference) {
-            throw new \Exception('No query set found by key ['. $this->key. ']. Make sure that this '.$this->key.' set is added to the chief.sets config array.');
+            throw new \Exception('No query set found by key ['.$this->key.']. Make sure that this '.$this->key.' set is added to the chief.sets config array.');
         }
 
         return $reference;

src/Common/vendors/htmlLawed.php

Spacing +74 added lines, -74 removed lines

@@ -8,9 +8,9 @@ 
 
 See htmLawed_README.txt/htm
 */
-if(!function_exists('htmLawed')){
+if (!function_exists('htmLawed')) {
 
-    function htmLawed($t, $C=1, $S=array())
+    function htmLawed($t, $C = 1, $S = array())
     {
         $C = is_array($C) ? $C : array();
         if (!empty($C['valid_xhtml'])) {
@@ -28,26 +28,26 @@ 
             $e = array();
         } elseif (strpos($x, '*') === false) {
             $e = array_flip(explode(',', $x));
-        } else {
+        }else {
             if (isset($x[1])) {
                 preg_match_all('`(?:^|-|\+)[^\-+]+?(?=-|\+|$)`', $x, $m, PREG_SET_ORDER);
-                for ($i=count($m); --$i>=0;) {
+                for ($i = count($m); --$i >= 0;) {
                     $m[$i] = $m[$i][0];
                 }
                 foreach ($m as $v) {
                     if ($v[0] == '+') {
                         $e[substr($v, 1)] = 1;
                     }
-                    if ($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'. $v, $m)) {
+                    if ($v[0] == '-' && isset($e[($v = substr($v, 1))]) && !in_array('+'.$v, $m)) {
                         unset($e[$v]);
                     }
                 }
             }
         }
-        $C['elements'] =& $e;
+        $C['elements'] = & $e;
         // config attrs
         $x = !empty($C['deny_attribute']) ? str_replace(array("\n", "\r", "\t", ' '), '', $C['deny_attribute']) : '';
-        $x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x. (!empty($C['safe']) ? ',on*' : '')));
+        $x = array_flip((isset($x[0]) && $x[0] == '*') ? explode('-', $x) : explode(',', $x.(!empty($C['safe']) ? ',on*' : '')));
         if (isset($x['on*'])) {
             unset($x['on*']);
             $x += array('onblur'=>1, 'onchange'=>1, 'onclick'=>1, 'ondblclick'=>1, 'onfocus'=>1, 'onkeydown'=>1, 'onkeypress'=>1, 'onkeyup'=>1, 'onmousedown'=>1, 'onmousemove'=>1, 'onmouseout'=>1, 'onmouseover'=>1, 'onmouseup'=>1, 'onreset'=>1, 'onselect'=>1, 'onsubmit'=>1);
@@ -111,7 +111,7 @@ 
         $t = preg_replace('`[\x00-\x08\x0b-\x0c\x0e-\x1f]`', '', $t);
         if ($C['clean_ms_char']) {
             $x = array("\x7f"=>'', "\x80"=>'€', "\x81"=>'', "\x83"=>'ƒ', "\x85"=>'…', "\x86"=>'†', "\x87"=>'‡', "\x88"=>'ˆ', "\x89"=>'‰', "\x8a"=>'Š', "\x8b"=>'‹', "\x8c"=>'Œ', "\x8d"=>'', "\x8e"=>'Ž', "\x8f"=>'', "\x90"=>'', "\x95"=>'•', "\x96"=>'–', "\x97"=>'—', "\x98"=>'˜', "\x99"=>'™', "\x9a"=>'š', "\x9b"=>'›', "\x9c"=>'œ', "\x9d"=>'', "\x9e"=>'ž', "\x9f"=>'Ÿ');
-            $x = $x + ($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
+            $x = $x+($C['clean_ms_char'] == 1 ? array("\x82"=>'‚', "\x84"=>'„', "\x91"=>'‘', "\x92"=>'’', "\x93"=>'“', "\x94"=>'”') : array("\x82"=>'\'', "\x84"=>'"', "\x91"=>'\'', "\x92"=>'\'', "\x93"=>'"', "\x94"=>'"'));
             $t = strtr($t, $x);
         }
         if ($C['cdata'] or $C['comment']) {
@@ -197,7 +197,7 @@ 
         // eof
     }
 
-    function hl_bal($t, $do=1, $in='div')
+    function hl_bal($t, $do = 1, $in = 'div')
     {
         // balance tags
 // by content
@@ -219,7 +219,7 @@ 
         $eI = array('#pcdata'=>1, 'a'=>1, 'abbr'=>1, 'acronym'=>1, 'applet'=>1, 'b'=>1, 'bdo'=>1, 'big'=>1, 'br'=>1, 'button'=>1, 'cite'=>1, 'code'=>1, 'del'=>1, 'dfn'=>1, 'em'=>1, 'embed'=>1, 'font'=>1, 'i'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'ins'=>1, 'kbd'=>1, 'label'=>1, 'map'=>1, 'object'=>1, 'q'=>1, 'ruby'=>1, 's'=>1, 'samp'=>1, 'select'=>1, 'script'=>1, 'small'=>1, 'span'=>1, 'strike'=>1, 'strong'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1, 'tt'=>1, 'u'=>1, 'var'=>1);
         $eN = array('a'=>1, 'big'=>1, 'button'=>1, 'fieldset'=>1, 'font'=>1, 'form'=>1, 'iframe'=>1, 'img'=>1, 'input'=>1, 'label'=>1, 'object'=>1, 'ruby'=>1, 'script'=>1, 'select'=>1, 'small'=>1, 'sub'=>1, 'sup'=>1, 'textarea'=>1); // Exclude from specific ele; $cN values
         $eO = array('area'=>1, 'caption'=>1, 'col'=>1, 'colgroup'=>1, 'dd'=>1, 'dt'=>1, 'legend'=>1, 'li'=>1, 'optgroup'=>1, 'option'=>1, 'param'=>1, 'rb'=>1, 'rbc'=>1, 'rp'=>1, 'rt'=>1, 'rtc'=>1, 'script'=>1, 'tbody'=>1, 'td'=>1, 'tfoot'=>1, 'thead'=>1, 'th'=>1, 'tr'=>1); // Missing in $eB & $eI
-        $eF = $eB + $eI;
+        $eF = $eB+$eI;
 
         // $in sets allowed child
         $in = ((isset($eF[$in]) && $in != '#pcdata') or isset($eO[$in])) ? $in : 'div';
@@ -240,7 +240,7 @@ 
             unset($cI['del'], $cI['ins']);
         }
         if (isset($cO[$in])) {
-            $inOk = $inOk + $cO[$in];
+            $inOk = $inOk+$cO[$in];
         }
         if (isset($cN[$in])) {
             $inOk = array_diff_assoc($inOk, $cN[$in]);
@@ -250,7 +250,7 @@ 
         $ok = $q = array(); // $q seq list of open non-empty ele
         ob_start();
 
-        for ($i=-1, $ci=count($t); ++$i<$ci;) {
+        for ($i = -1, $ci = count($t); ++$i < $ci;) {
             // allowed $ok in parent $p
             if ($ql = count($q)) {
                 $p = array_pop($q);
@@ -269,12 +269,12 @@ 
                     unset($cI['del'], $cI['ins']);
                 }
                 if (isset($cO[$p])) {
-                    $ok = $ok + $cO[$p];
+                    $ok = $ok+$cO[$p];
                 }
                 if (isset($cN[$p])) {
                     $ok = array_diff_assoc($ok, $cN[$p]);
                 }
-            } else {
+            }else {
                 $ok = $inOk;
                 unset($cI['del'], $cI['ins']);
             }
@@ -317,10 +317,10 @@ 
                     continue;
                 } // Last open
                 $add = ''; // Nesting - close open tags that need to be
-                for ($j=-1, $cj=count($q); ++$j<$cj;) {
+                for ($j = -1, $cj = count($q); ++$j < $cj;) {
                     if (($d = array_pop($q)) == $e) {
                         break;
-                    } else {
+                    }else {
                         $add .= "</{$d}>";
                     }
                 }
@@ -332,7 +332,7 @@ 
             // $cB ele needs $eB ele as child
             if (isset($cB[$e]) && strlen(trim($x))) {
                 $t[$i] = "{$e}{$a}>";
-                array_splice($t, $i+1, 0, 'div>'. $x);
+                array_splice($t, $i+1, 0, 'div>'.$x);
                 unset($e, $x);
                 ++$ci;
                 --$i;
@@ -374,7 +374,7 @@ 
             // nesting
             $add = '';
             $q2 = array();
-            for ($k=-1, $kc=count($q); ++$k<$kc;) {
+            for ($k = -1, $kc = count($q); ++$k < $kc;) {
                 $d = $q[$k];
                 $ok2 = array();
                 if (isset($cS[$d])) {
@@ -383,7 +383,7 @@ 
                 }
                 $ok2 = isset($cI[$d]) ? $eI : $eF;
                 if (isset($cO[$d])) {
-                    $ok2 = $ok2 + $cO[$d];
+                    $ok2 = $ok2+$cO[$d];
                 }
                 if (isset($cN[$d])) {
                     $ok2 = array_diff_assoc($ok2, $cN[$d]);
@@ -393,11 +393,11 @@ 
                         continue 2;
                     }
                     $add = "</{$d}>";
-                    for (;++$k<$kc;) {
+                    for (;++$k < $kc;) {
                         $add = "</{$q[$k]}>{$add}";
                     }
                     break;
-                } else {
+                }else {
                     $q2[] = $d;
                 }
             }
@@ -428,12 +428,12 @@ 
                 unset($cI['del'], $cI['ins']);
             }
             if (isset($cO[$p])) {
-                $ok = $ok + $cO[$p];
+                $ok = $ok+$cO[$p];
             }
             if (isset($cN[$p])) {
                 $ok = array_diff_assoc($ok, $cN[$p]);
             }
-        } else {
+        }else {
             $ok = $inOk;
             unset($cI['del'], $cI['ins']);
         }
@@ -477,7 +477,7 @@ 
             if (substr(($t = preg_replace('`--+`', '-', substr($t, 4, -3))), -1) != ' ') {
                 $t .= ' ';
             }
-        } else {
+        }else {
             $t = substr($t, 1, -1);
         }
         $t = $v == 2 ? str_replace(array('&', '<', '>'), array('&amp;', '&lt;', '&gt;'), $t) : $t;
@@ -490,19 +490,19 @@ 
         // entitity handler
         global $C;
         $t = $t[1];
-        static $U = array('quot'=>1,'amp'=>1,'lt'=>1,'gt'=>1);
-        static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39',  'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
+        static $U = array('quot'=>1, 'amp'=>1, 'lt'=>1, 'gt'=>1);
+        static $N = array('fnof'=>'402', 'Alpha'=>'913', 'Beta'=>'914', 'Gamma'=>'915', 'Delta'=>'916', 'Epsilon'=>'917', 'Zeta'=>'918', 'Eta'=>'919', 'Theta'=>'920', 'Iota'=>'921', 'Kappa'=>'922', 'Lambda'=>'923', 'Mu'=>'924', 'Nu'=>'925', 'Xi'=>'926', 'Omicron'=>'927', 'Pi'=>'928', 'Rho'=>'929', 'Sigma'=>'931', 'Tau'=>'932', 'Upsilon'=>'933', 'Phi'=>'934', 'Chi'=>'935', 'Psi'=>'936', 'Omega'=>'937', 'alpha'=>'945', 'beta'=>'946', 'gamma'=>'947', 'delta'=>'948', 'epsilon'=>'949', 'zeta'=>'950', 'eta'=>'951', 'theta'=>'952', 'iota'=>'953', 'kappa'=>'954', 'lambda'=>'955', 'mu'=>'956', 'nu'=>'957', 'xi'=>'958', 'omicron'=>'959', 'pi'=>'960', 'rho'=>'961', 'sigmaf'=>'962', 'sigma'=>'963', 'tau'=>'964', 'upsilon'=>'965', 'phi'=>'966', 'chi'=>'967', 'psi'=>'968', 'omega'=>'969', 'thetasym'=>'977', 'upsih'=>'978', 'piv'=>'982', 'bull'=>'8226', 'hellip'=>'8230', 'prime'=>'8242', 'Prime'=>'8243', 'oline'=>'8254', 'frasl'=>'8260', 'weierp'=>'8472', 'image'=>'8465', 'real'=>'8476', 'trade'=>'8482', 'alefsym'=>'8501', 'larr'=>'8592', 'uarr'=>'8593', 'rarr'=>'8594', 'darr'=>'8595', 'harr'=>'8596', 'crarr'=>'8629', 'lArr'=>'8656', 'uArr'=>'8657', 'rArr'=>'8658', 'dArr'=>'8659', 'hArr'=>'8660', 'forall'=>'8704', 'part'=>'8706', 'exist'=>'8707', 'empty'=>'8709', 'nabla'=>'8711', 'isin'=>'8712', 'notin'=>'8713', 'ni'=>'8715', 'prod'=>'8719', 'sum'=>'8721', 'minus'=>'8722', 'lowast'=>'8727', 'radic'=>'8730', 'prop'=>'8733', 'infin'=>'8734', 'ang'=>'8736', 'and'=>'8743', 'or'=>'8744', 'cap'=>'8745', 'cup'=>'8746', 'int'=>'8747', 'there4'=>'8756', 'sim'=>'8764', 'cong'=>'8773', 'asymp'=>'8776', 'ne'=>'8800', 'equiv'=>'8801', 'le'=>'8804', 'ge'=>'8805', 'sub'=>'8834', 'sup'=>'8835', 'nsub'=>'8836', 'sube'=>'8838', 'supe'=>'8839', 'oplus'=>'8853', 'otimes'=>'8855', 'perp'=>'8869', 'sdot'=>'8901', 'lceil'=>'8968', 'rceil'=>'8969', 'lfloor'=>'8970', 'rfloor'=>'8971', 'lang'=>'9001', 'rang'=>'9002', 'loz'=>'9674', 'spades'=>'9824', 'clubs'=>'9827', 'hearts'=>'9829', 'diams'=>'9830', 'apos'=>'39', 'OElig'=>'338', 'oelig'=>'339', 'Scaron'=>'352', 'scaron'=>'353', 'Yuml'=>'376', 'circ'=>'710', 'tilde'=>'732', 'ensp'=>'8194', 'emsp'=>'8195', 'thinsp'=>'8201', 'zwnj'=>'8204', 'zwj'=>'8205', 'lrm'=>'8206', 'rlm'=>'8207', 'ndash'=>'8211', 'mdash'=>'8212', 'lsquo'=>'8216', 'rsquo'=>'8217', 'sbquo'=>'8218', 'ldquo'=>'8220', 'rdquo'=>'8221', 'bdquo'=>'8222', 'dagger'=>'8224', 'Dagger'=>'8225', 'permil'=>'8240', 'lsaquo'=>'8249', 'rsaquo'=>'8250', 'euro'=>'8364', 'nbsp'=>'160', 'iexcl'=>'161', 'cent'=>'162', 'pound'=>'163', 'curren'=>'164', 'yen'=>'165', 'brvbar'=>'166', 'sect'=>'167', 'uml'=>'168', 'copy'=>'169', 'ordf'=>'170', 'laquo'=>'171', 'not'=>'172', 'shy'=>'173', 'reg'=>'174', 'macr'=>'175', 'deg'=>'176', 'plusmn'=>'177', 'sup2'=>'178', 'sup3'=>'179', 'acute'=>'180', 'micro'=>'181', 'para'=>'182', 'middot'=>'183', 'cedil'=>'184', 'sup1'=>'185', 'ordm'=>'186', 'raquo'=>'187', 'frac14'=>'188', 'frac12'=>'189', 'frac34'=>'190', 'iquest'=>'191', 'Agrave'=>'192', 'Aacute'=>'193', 'Acirc'=>'194', 'Atilde'=>'195', 'Auml'=>'196', 'Aring'=>'197', 'AElig'=>'198', 'Ccedil'=>'199', 'Egrave'=>'200', 'Eacute'=>'201', 'Ecirc'=>'202', 'Euml'=>'203', 'Igrave'=>'204', 'Iacute'=>'205', 'Icirc'=>'206', 'Iuml'=>'207', 'ETH'=>'208', 'Ntilde'=>'209', 'Ograve'=>'210', 'Oacute'=>'211', 'Ocirc'=>'212', 'Otilde'=>'213', 'Ouml'=>'214', 'times'=>'215', 'Oslash'=>'216', 'Ugrave'=>'217', 'Uacute'=>'218', 'Ucirc'=>'219', 'Uuml'=>'220', 'Yacute'=>'221', 'THORN'=>'222', 'szlig'=>'223', 'agrave'=>'224', 'aacute'=>'225', 'acirc'=>'226', 'atilde'=>'227', 'auml'=>'228', 'aring'=>'229', 'aelig'=>'230', 'ccedil'=>'231', 'egrave'=>'232', 'eacute'=>'233', 'ecirc'=>'234', 'euml'=>'235', 'igrave'=>'236', 'iacute'=>'237', 'icirc'=>'238', 'iuml'=>'239', 'eth'=>'240', 'ntilde'=>'241', 'ograve'=>'242', 'oacute'=>'243', 'ocirc'=>'244', 'otilde'=>'245', 'ouml'=>'246', 'divide'=>'247', 'oslash'=>'248', 'ugrave'=>'249', 'uacute'=>'250', 'ucirc'=>'251', 'uuml'=>'252', 'yacute'=>'253', 'thorn'=>'254', 'yuml'=>'255');
         if ($t[0] != '#') {
-            return ($C['and_mark'] ? "\x06" : '&'). (isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'. ($C['hexdec_entity'] > 1 ? 'x'. dechex($N[$t]) : $N[$t]) : $t) : 'amp;'. $t)). ';';
+            return ($C['and_mark'] ? "\x06" : '&').(isset($U[$t]) ? $t : (isset($N[$t]) ? (!$C['named_entity'] ? '#'.($C['hexdec_entity'] > 1 ? 'x'.dechex($N[$t]) : $N[$t]) : $t) : 'amp;'.$t)).';';
         }
         if (($n = ctype_digit($t = substr($t, 1)) ? intval($t) : hexdec(substr($t, 1))) < 9 or ($n > 13 && $n < 32) or $n == 11 or $n == 12 or ($n > 126 && $n < 160 && $n != 133) or ($n > 55295 && ($n < 57344 or ($n > 64975 && $n < 64992) or $n == 65534 or $n == 65535 or $n > 1114111))) {
-            return ($C['and_mark'] ? "\x06" : '&'). "amp;#{$t};";
+            return ($C['and_mark'] ? "\x06" : '&')."amp;#{$t};";
         }
-        return ($C['and_mark'] ? "\x06" : '&'). '#'. (((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'. dechex($n)). ';';
+        return ($C['and_mark'] ? "\x06" : '&').'#'.(((ctype_digit($t) && $C['hexdec_entity'] < 2) or !$C['hexdec_entity']) ? $n : 'x'.dechex($n)).';';
         // eof
     }
 
-    function hl_prot($p, $c=null)
+    function hl_prot($p, $c = null)
     {
         // check URL scheme
         global $C;
@@ -529,18 +529,18 @@ 
                 $p = substr($p, strlen($C['base_url']));
             } elseif (empty($m[1])) { // Make URL abs
                 if (substr($p, 0, 2) == '//') {
-                    $p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1). $p;
+                    $p = substr($C['base_url'], 0, strpos($C['base_url'], ':')+1).$p;
                 } elseif ($p[0] == '/') {
-                    $p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']). $p;
+                    $p = preg_replace('`(^.+?://[^/]+)(.*)`', '$1', $C['base_url']).$p;
                 } elseif (strcspn($p, './')) {
-                    $p = $C['base_url']. $p;
-                } else {
+                    $p = $C['base_url'].$p;
+                }else {
                     preg_match('`^([a-zA-Z\d\-+.]+://[^/]+)(.*)`', $C['base_url'], $m);
-                    $p = preg_replace('`(?<=/)\./`', '', $m[2]. $p);
+                    $p = preg_replace('`(?<=/)\./`', '', $m[2].$p);
                     while (preg_match('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', $p)) {
                         $p = preg_replace('`(?<=/)([^/]{3,}|[^/.]+?|\.[^/.]|[^/.]\.)/\.\./`', '', $p);
                     }
-                    $p = $m[1]. $p;
+                    $p = $m[1].$p;
                 }
             }
         }
@@ -556,7 +556,7 @@ 
         }
         if ($t = ini_get('track_errors')) {
             $o = isset($php_errormsg) ? $php_errormsg : null;
-        } else {
+        }else {
             ini_set('track_errors', 1);
         }
         unset($php_errormsg);
@@ -570,7 +570,7 @@ 
         $r = isset($php_errormsg) ? 0 : 1;
         if ($t) {
             $php_errormsg = isset($o) ? $o : null;
-        } else {
+        }else {
             ini_set('track_errors', 0);
         }
         return $r;
@@ -582,9 +582,9 @@ 
         // final $spec
         $s = array();
         $t = str_replace(array("\t", "\r", "\n", ' '), '', preg_replace_callback('/"(?>(`.|[^"])*)"/sm', create_function('$m', 'return substr(str_replace(array(";", "|", "~", " ", ",", "/", "(", ")", \'`"\'), array("\x01", "\x02", "\x03", "\x04", "\x05", "\x06", "\x07", "\x08", "\""), $m[0]), 1, -1);'), trim($t)));
-        for ($i = count(($t = explode(';', $t))); --$i>=0;) {
+        for ($i = count(($t = explode(';', $t))); --$i >= 0;) {
             $w = $t[$i];
-            if (empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a =  substr($w, $e+1)))) {
+            if (empty($w) or ($e = strpos($w, '=')) === false or !strlen(($a = substr($w, $e+1)))) {
                 continue;
             }
             $y = $n = array();
@@ -652,7 +652,7 @@ 
         if (!preg_match('`^<(/?)([a-zA-Z][a-zA-Z1-6]*)([^>]*?)\s?>$`m', $t, $m)) {
             return str_replace(array('<', '>'), array('&lt;', '&gt;'), $t);
         } elseif (!isset($C['elements'][($e = strtolower($m[2]))])) {
-            return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+            return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
         }
         // attr string
         $a = str_replace(array("\n", "\r", "\t"), ' ', trim($m[3]));
@@ -661,13 +661,13 @@ 
         if ($C['make_tag_strict'] && isset($eD[$e])) {
             $trt = hl_tag2($e, $a, $C['make_tag_strict']);
             if (!$e) {
-                return (($C['keep_bad']%2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
+                return (($C['keep_bad'] % 2) ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : '');
             }
         }
         // close tag
         static $eE = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1); // Empty ele
         if (!empty($m[1])) {
-            return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad'])%2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
+            return (!isset($eE[$e]) ? (empty($C['hook_tag']) ? "</$e>" : $C['hook_tag']($e)) : (($C['keep_bad']) % 2 ? str_replace(array('<', '>'), array('&lt;', '&gt;'), $t) : ''));
         }
 
         // open tag & attr
@@ -712,7 +712,7 @@ 
                     $w = 1;
                     $mode = 2;
                     $a = ltrim($a, '= ');
-                } else { // No val
+                }else { // No val
                     $w = 1;
                     $mode = 0;
                     $a = ltrim($a);
@@ -777,7 +777,7 @@ 
                                     if (!preg_match('`\bnofollow\b`i', $aA['rel'])) {
                                         $nfr = 1;
                                     }
-                                } else {
+                                }else {
                                     $a['rel'] = 'nofollow';
                                 }
                             }
@@ -791,7 +791,7 @@ 
             }
         }
         if ($nfr) {
-            $a['rel'] = isset($a['rel']) ? $a['rel']. ' nofollow' : 'nofollow';
+            $a['rel'] = isset($a['rel']) ? $a['rel'].' nofollow' : 'nofollow';
         }
 
         // rqd attr
@@ -814,36 +814,36 @@ 
                 if ($k == 'align') {
                     unset($a['align']);
                     if ($e == 'img' && ($v == 'left' or $v == 'right')) {
-                        $c[] = 'float: '. $v;
+                        $c[] = 'float: '.$v;
                     } elseif (($e == 'div' or $e == 'table') && $v == 'center') {
                         $c[] = 'margin: auto';
-                    } else {
-                        $c[] = 'text-align: '. $v;
+                    }else {
+                        $c[] = 'text-align: '.$v;
                     }
                 } elseif ($k == 'bgcolor') {
                     unset($a['bgcolor']);
-                    $c[] = 'background-color: '. $v;
+                    $c[] = 'background-color: '.$v;
                 } elseif ($k == 'border') {
                     unset($a['border']);
                     $c[] = "border: {$v}px";
                 } elseif ($k == 'bordercolor') {
                     unset($a['bordercolor']);
-                    $c[] = 'border-color: '. $v;
+                    $c[] = 'border-color: '.$v;
                 } elseif ($k == 'clear') {
                     unset($a['clear']);
-                    $c[] = 'clear: '. ($v != 'all' ? $v : 'both');
+                    $c[] = 'clear: '.($v != 'all' ? $v : 'both');
                 } elseif ($k == 'compact') {
                     unset($a['compact']);
                     $c[] = 'font-size: 85%';
                 } elseif ($k == 'height' or $k == 'width') {
                     unset($a[$k]);
-                    $c[] = $k. ': '. ($v[0] != '*' ? $v. (ctype_digit($v) ? 'px' : '') : 'auto');
+                    $c[] = $k.': '.($v[0] != '*' ? $v.(ctype_digit($v) ? 'px' : '') : 'auto');
                 } elseif ($k == 'hspace') {
                     unset($a['hspace']);
                     $c[] = "margin-left: {$v}px; margin-right: {$v}px";
                 } elseif ($k == 'language' && !isset($a['type'])) {
                     unset($a['language']);
-                    $a['type'] = 'text/'. strtolower($v);
+                    $a['type'] = 'text/'.strtolower($v);
                 } elseif ($k == 'name') {
                     if ($C['no_deprecated_attr'] == 2 or ($e != 'a' && $e != 'map')) {
                         unset($a['name']);
@@ -859,13 +859,13 @@ 
                     $c[] = 'white-space: nowrap';
                 } elseif ($k == 'size') {
                     unset($a['size']);
-                    $c[] = 'size: '. $v. 'px';
+                    $c[] = 'size: '.$v.'px';
                 } elseif ($k == 'start' or $k == 'value') {
                     unset($a[$k]);
                 } elseif ($k == 'type') {
                     unset($a['type']);
                     static $ol_type = array('i'=>'lower-roman', 'I'=>'upper-roman', 'a'=>'lower-latin', 'A'=>'upper-latin', '1'=>'decimal');
-                    $c[] = 'list-style-type: '. (isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
+                    $c[] = 'list-style-type: '.(isset($ol_type[$v]) ? $ol_type[$v] : 'decimal');
                 } elseif ($k == 'vspace') {
                     unset($a['vspace']);
                     $c[] = "margin-top: {$v}px; margin-bottom: {$v}px";
@@ -873,16 +873,16 @@ 
             }
             if (count($c)) {
                 $c = implode('; ', $c);
-                $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $c. ';': $c. ';';
+                $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$c.';' : $c.';';
             }
         }
         // unique ID
         if ($C['unique_ids'] && isset($a['id'])) {
             if (!preg_match('`^[A-Za-z][A-Za-z0-9_\-.:]*$`', ($id = $a['id'])) or (isset($GLOBALS['hl_Ids'][$id]) && $C['unique_ids'] == 1)) {
                 unset($a['id']);
-            } else {
+            }else {
                 while (isset($GLOBALS['hl_Ids'][$id])) {
-                    $id = $C['unique_ids']. $id;
+                    $id = $C['unique_ids'].$id;
                 }
                 $GLOBALS['hl_Ids'][($a['id'] = $id)] = 1;
             }
@@ -896,7 +896,7 @@ 
         }
         // for transformed tag
         if (!empty($trt)) {
-            $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;'). '; '. $trt : $trt;
+            $a['style'] = isset($a['style']) ? rtrim($a['style'], ' ;').'; '.$trt : $trt;
         }
         // return with empty ele /
         if (empty($C['hook_tag'])) {
@@ -904,14 +904,14 @@ 
             foreach ($a as $k=>$v) {
                 $aA .= " {$k}=\"{$v}\"";
             }
-            return "<{$e}{$aA}". (isset($eE[$e]) ? ' /' : ''). '>';
-        } else {
+            return "<{$e}{$aA}".(isset($eE[$e]) ? ' /' : '').'>';
+        }else {
             return $C['hook_tag']($e, $a);
         }
         // eof
     }
 
-    function hl_tag2(&$e, &$a, $t=1)
+    function hl_tag2(&$e, &$a, $t = 1)
     {
         // transform tag
         if ($e == 'center') {
@@ -934,13 +934,13 @@ 
         if ($e == 'font') {
             $a2 = '';
             if (preg_match('`face\s*=\s*(\'|")([^=]+?)\\1`i', $a, $m) or preg_match('`face\s*=(\s*)(\S+)`i', $a, $m)) {
-                $a2 .= ' font-family: '. str_replace('"', '\'', trim($m[2])). ';';
+                $a2 .= ' font-family: '.str_replace('"', '\'', trim($m[2])).';';
             }
             if (preg_match('`color\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m)) {
-                $a2 .= ' color: '. trim($m[2]). ';';
+                $a2 .= ' color: '.trim($m[2]).';';
             }
             if (preg_match('`size\s*=\s*(\'|")?(.+?)(\\1|\s|$)`i', $a, $m) && isset($fs[($m = trim($m[2]))])) {
-                $a2 .= ' font-size: '. $fs[$m]. ';';
+                $a2 .= ' font-size: '.$fs[$m].';';
             }
             $e = 'span';
             return ltrim($a2);
@@ -980,7 +980,7 @@ 
                 echo str_repeat($s, ++$n);
             }
             echo ltrim(array_shift($t));
-            for ($i=-1, $j=count($t); ++$i<$j;) {
+            for ($i = -1, $j = count($t); ++$i < $j;) {
                 $r = '';
                 list($e, $r) = explode('>', $t[$i]);
                 $x = $e[0] == '/' ? 0 : (substr($e, -1) == '/' ? 1 : ($e[0] != '!' ? 2 : -1));
@@ -990,22 +990,22 @@ 
                     if (!$x) {
                         if ($n) {
                             echo "\n", str_repeat($s, --$n), "$e\n", str_repeat($s, $n);
-                        } else {
+                        }else {
                             ++$N;
                             ob_end_clean();
                             continue 2;
                         }
-                    } else {
+                    }else {
                         echo "\n", str_repeat($s, $n), "$e\n", str_repeat($s, ($x != 1 ? ++$n : $n));
                     }
                     echo $r;
                     continue;
                 }
-                $f = "\n". str_repeat($s, $n);
+                $f = "\n".str_repeat($s, $n);
                 if (isset($c[$y])) {
                     if (!$x) {
                         echo $e, $f, $r;
-                    } else {
+                    }else {
                         echo $f, $e, $r;
                     }
                 } elseif (isset($b[$y])) {
@@ -1014,7 +1014,7 @@ 
                     echo $e, $f, $r;
                 } elseif (!$y) {
                     echo $f, $e, $f, $r;
-                } else {
+                }else {
                     echo $e, $r;
                 }
             }
@@ -1036,7 +1036,7 @@ 
         // eof
     }
 
-    function kses($t, $h, $p=array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'))
+    function kses($t, $h, $p = array('http', 'https', 'ftp', 'news', 'nntp', 'telnet', 'gopher', 'mailto'))
     {
         // kses compat
         foreach ($h as $k=>$v) {
@@ -1046,7 +1046,7 @@ 
         $C['keep_bad'] = 1;
         $C['elements'] = count($h) ? strtolower(implode(',', array_keys($h))) : '-*';
         $C['hook'] = 'kses_hook';
-        $C['schemes'] = '*:'. implode(',', $p);
+        $C['schemes'] = '*:'.implode(',', $p);
         return htmLawed($t, $C, $h);
         // eof
     }

src/Common/helpers.php

Spacing +13 added lines, -13 removed lines

@@ -87,7 +87,7 @@ 
         $empty = true;
 
         foreach ($values as $value) {
-            if (! $value || !trim($value)) {
+            if (!$value || !trim($value)) {
                 continue;
             }
             $empty = false;
@@ -97,7 +97,7 @@ 
     }
 }
 
-if (! function_exists('contract')) {
+if (!function_exists('contract')) {
     function contract($instance, $contract)
     {
         return $instance instanceof $contract;
@@ -126,7 +126,7 @@ 
             $text = cleanupHTML($text, $clean);
         }
         $teaser = substr($text, 0, $max);
-        return strlen($text) <= $max ? $teaser : $teaser . $ending;
+        return strlen($text) <= $max ? $teaser : $teaser.$ending;
     }
 }
 
@@ -165,7 +165,7 @@ 
     function cleanupHTML($value, $whitelist = null)
     {
         if (!function_exists('cleanupHTML')) {
-            require_once __DIR__ . '/vendors/htmlLawed.php';
+            require_once __DIR__.'/vendors/htmlLawed.php';
         }
         if (is_null($whitelist)) {
             $whitelist = '<code><span><div><label><a><br><p><b><i><del><strike><u><img><video><audio><iframe><object><embed><param><blockquote><mark><cite><small><ul><ol><li><hr><dl><dt><dd><sup><sub><big><pre><code><figure><figcaption><strong><em><table><tr><td><th><tbody><thead><tfoot><h1><h2><h3><h4><h5><h6>';
@@ -251,16 +251,16 @@ 
             'scheme', 'host', 'port', 'path', 'query', 'fragment'
         ], null), $parsed_url, $overrides);
 
-        $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'] . '://' : null;
-        $port = $parsed_url['port'] ? ':' . $parsed_url['port'] : null;
-        $fragment = $parsed_url['fragment'] ? '#' . $parsed_url['fragment'] : null;
+        $scheme = $parsed_url['scheme'] ? $parsed_url['scheme'].'://' : null;
+        $port = $parsed_url['port'] ? ':'.$parsed_url['port'] : null;
+        $fragment = $parsed_url['fragment'] ? '#'.$parsed_url['fragment'] : null;
 
-        $baseurl = $scheme . $parsed_url['host'] . $port . $parsed_url['path'];
+        $baseurl = $scheme.$parsed_url['host'].$port.$parsed_url['path'];
         $current_query = [];
 
         $_query = explode('&', $parsed_url['query']);
 
-        array_map(function ($v) use (&$current_query) {
+        array_map(function($v) use (&$current_query) {
             if (!$v) {
                 return;
             }
@@ -278,7 +278,7 @@ 
 
         $query = urldecode(http_build_query(array_merge($current_query, $query_params)));
 
-        return $baseurl . '?' . $query . $fragment;
+        return $baseurl.'?'.$query.$fragment;
     }
 }
 
@@ -287,9 +287,9 @@ 
     {
         $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 1);
         if (php_sapi_name() == 'cli') {
-            print_r("\e[1;30m dumped at: " . str_replace(base_path(), '', $trace[0]['file']). ", line: " . $trace[0]['line'] . "\e[40m\n");
-        } else {
-            print_r("[dumped at: " . str_replace(base_path(), '', $trace[0]['file']). ", line: " . $trace[0]['line'] . "]\n");
+            print_r("\e[1;30m dumped at: ".str_replace(base_path(), '', $trace[0]['file']).", line: ".$trace[0]['line']."\e[40m\n");
+        }else {
+            print_r("[dumped at: ".str_replace(base_path(), '', $trace[0]['file']).", line: ".$trace[0]['line']."]\n");
         }
         return dd($var, ...$moreVars);
     }

src/Nav/Nav.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
     public static function fromKeys($keys)
     {
-        $keys = (array) $keys;
+        $keys = (array)$keys;
         $collection = collect();
 
         /** @var Managers */
@@ -33,7 +33,7 @@ 
 
     public static function fromTags($tags)
     {
-        $tags = (array) $tags;
+        $tags = (array)$tags;
         $collection = collect();
 
         /** @var Managers */
@@ -52,9 +52,9 @@ 
 
     private static function fromManagers(Collection $collection)
     {
-        return new static(...$collection->reject(function ($manager) {
+        return new static(...$collection->reject(function($manager) {
             return !$manager->can('index');
-        })->map(function ($manager) {
+        })->map(function($manager) {
             return new NavItem($manager->details()->plural, $manager->route('index'), [
                 'key' => $manager->details()->key,
                 'tags' => app(Register::class)->filterByKey($manager->details()->key)->first()->tags()
@@ -64,7 +64,7 @@ 
 
     public function rejectKeys($keys)
     {
-        $keys = (array) $keys;
+        $keys = (array)$keys;
 
         foreach ($this->items as $k => $item) {
             if (in_array($item->details('key', ''), $keys)) {
@@ -77,7 +77,7 @@ 
 
     public function rejectTags($tags)
     {
-        $tags = (array) $tags;
+        $tags = (array)$tags;
 
         foreach ($this->items as $k => $item) {
             if (count(array_intersect($item->details('tags', []), $tags)) > 0) {
@@ -119,7 +119,7 @@ 
         $output = '';
 
         foreach ($this->items as $item) {
-            $output .= '<a class="block nav-item ' . (isActiveUrl($item->url()) ? 'active' : '') . '" href="'.$item->url().'">';
+            $output .= '<a class="block nav-item '.(isActiveUrl($item->url()) ? 'active' : '').'" href="'.$item->url().'">';
             $output .= $title ?? ucfirst($item->title());
             $output .= '</a>';
         }
@@ -146,14 +146,14 @@ 
 
         $items = '';
         foreach ($this->items as $item) {
-            $items .= '<a class="block squished --link-with-bg ' . (isActiveUrl($item->url()) ? 'active' : '') . '" href="'.$item->url().'">';
+            $items .= '<a class="block squished --link-with-bg '.(isActiveUrl($item->url()) ? 'active' : '').'" href="'.$item->url().'">';
             $items .= $item->title();
             $items .= '</a>';
         }
 
         // Surround within vue dropdown
         $output = '<dropdown>';
-        $output .= '<span class="center-y nav-item" slot="trigger" slot-scope="{ toggle, isActive }" @click="toggle">'. ($title ?? 'Collecties') .'</span>';
+        $output .= '<span class="center-y nav-item" slot="trigger" slot-scope="{ toggle, isActive }" @click="toggle">'.($title ?? 'Collecties').'</span>';
         $output .= '<div v-cloak class="dropdown-box inset-s">';
         $output .= $items;
         $output .= '</div>';

src/Authorization/Role.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
     public static function rolesForSelect($includeDeveloperRole = false)
     {
-        $roles = $includeDeveloperRole ? static::all() : static::all()->reject(function ($role) {
+        $roles = $includeDeveloperRole ? static::all() : static::all()->reject(function($role) {
             return $role->name == 'developer';
         });
 
@@ -39,7 +39,7 @@ 
 
     public function getPermissionsForIndex()
     {
-        $this->permissions->each(function ($permission) {
+        $this->permissions->each(function($permission) {
             $model = explode("_", $permission->name, 2)[1];
             $temp = $this->permission;
             $temp[$model][] = explode("_", $permission->name, 2)[0];

src/Modules/ModuleManager.php

Spacing +5 added lines, -5 removed lines

@@ -63,15 +63,15 @@ 
     {
         $permission = 'update-page';
 
-        if (in_array($verb, ['index','show'])) {
+        if (in_array($verb, ['index', 'show'])) {
             $permission = 'view-page';
-        } elseif (in_array($verb, ['create','store'])) {
+        } elseif (in_array($verb, ['create', 'store'])) {
             $permission = 'create-page';
         } elseif (in_array($verb, ['delete'])) {
             $permission = 'delete-page';
         }
 
-        if (! auth()->guard('chief')->user()->hasPermissionTo($permission)) {
+        if (!auth()->guard('chief')->user()->hasPermissionTo($permission)) {
             throw NotAllowedManagerRoute::notAllowedPermission($permission, $this);
         }
     }
@@ -103,7 +103,7 @@ 
     public function saveFields(): Manager
     {
         // Store the morph_key upon creation
-        if (! $this->model->morph_key) {
+        if (!$this->model->morph_key) {
             $this->model->morph_key = $this->model->morphKey();
         }
 
@@ -142,7 +142,7 @@ 
             if (is_array_empty($translation)) {
 
                 // Nullify all values
-                $trans[$locale] = array_map(function ($value) {
+                $trans[$locale] = array_map(function($value) {
                     return null;
                 }, $translation);
                 continue;

src/Media/UploadMedia.php

Spacing +7 added lines, -7 removed lines

@@ -59,7 +59,7 @@ 
         if (is_string($file)) {
             $image_name = json_decode($file)->output->name;
             $asset      = $this->addAsset(json_decode($file)->output->image, $type, null, $image_name, $model);
-        } else {
+        }else {
             $image_name = $file->getClientOriginalName();
             $asset      = $this->addAsset($file, $type, null, $image_name, $model);
         }
@@ -82,7 +82,7 @@ 
 
         if (is_string($file)) {
             $asset = AssetUploader::uploadFromBase64($file, $filename);
-        } else {
+        }else {
             $asset = AssetUploader::upload($file, $filename);
         }
 
@@ -126,9 +126,9 @@ 
      */
     private function sluggifyFilename($filename): string
     {
-        $extension = substr($filename, strrpos($filename, '.') + 1);
+        $extension = substr($filename, strrpos($filename, '.')+1);
         $filename  = substr($filename, 0, strrpos($filename, '.'));
-        $filename  = str_slug($filename) . '.' . $extension;
+        $filename  = str_slug($filename).'.'.$extension;
 
         return $filename;
     }
@@ -144,9 +144,9 @@ 
                 if ($file instanceof UploadedFile && !$file->isValid()) {
                     if ($file->getError() == UPLOAD_ERR_INI_SIZE) {
                         throw new FileTooBigException(
-                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' .
-                            'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' .
-                            'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB'
+                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '.
+                            'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '.
+                            'post_max_size: '.(int)(ini_get('post_max_size')).'MB'
                         );
                     }
                 }