phptal / PHPTAL

tools/phptal_lint.php

Spacing +18 added lines, -18 removed lines

@@ -27,7 +27,7 @@ 
     {
         try
         {
-            if (! empty($_SERVER['REQUEST_URI'])) {
+            if (!empty($_SERVER['REQUEST_URI'])) {
                 throw new Exception("Please use this tool from command line");
             }
 
@@ -76,7 +76,7 @@ 
                 echo " Skipped ".$this->plural($lint->skipped, "non-template file").".";
             }
             echo "\n";
-            if (! $custom_extensions && count($lint->skipped_filenames)) {
+            if (!$custom_extensions && count($lint->skipped_filenames)) {
                 echo "Skipped file(s): ", implode(', ', array_keys($lint->skipped_filenames)), ".\n";
             }
 
@@ -86,7 +86,7 @@ 
                 echo "\n";
                 exit(2);
             } else if (count($lint->warnings)) {
-                echo "Found ".$this->plural(count($lint->warnings),"warning").":\n";
+                echo "Found ".$this->plural(count($lint->warnings), "warning").":\n";
                 $this->display_erorr_array($lint->warnings);
                 echo "\n";
                 exit(0);
@@ -95,8 +95,8 @@ 
                 exit($lint->checked ? 0 : 1);
             }
         }
-        catch(Exception $e) {
-            fwrite(STDERR, $e->getMessage() . "\n");
+        catch (Exception $e) {
+            fwrite(STDERR, $e->getMessage()."\n");
             $errcode = $e->getCode();
             exit($errcode ? $errcode : 1);
         }
@@ -119,7 +119,7 @@ 
     function usage()
     {
         $this->require_phptal();
-        echo "PHPTAL Lint 1.1.3 (PHPTAL ", strtr(PHPTAL_VERSION,"_","."), ")\n";
+        echo "PHPTAL Lint 1.1.3 (PHPTAL ", strtr(PHPTAL_VERSION, "_", "."), ")\n";
 
         echo "Usage: phptal_lint.php [-e extensions] [-i php_file_or_directory] file_or_directory_to_check ...\n";
         echo "  -e comma-separated list of extensions\n";
@@ -136,11 +136,11 @@ 
     function extended_getopt(array $options)
     {
         $results = array('--filenames--'=>array());
-        for ($i = 1; $i < count($_SERVER['argv']); $i ++) {
+        for ($i = 1; $i < count($_SERVER['argv']); $i++) {
             if (in_array($_SERVER['argv'][$i], $options)) {
-                $results[substr($_SERVER['argv'][$i], 1)][] = $_SERVER['argv'][++ $i];
+                $results[substr($_SERVER['argv'][$i], 1)][] = $_SERVER['argv'][++$i];
             } else if ($_SERVER['argv'][$i] == '--') {
-                $results['--filenames--'] = array_merge($results['--filenames--'], array_slice($_SERVER['argv'],$i+1));
+                $results['--filenames--'] = array_merge($results['--filenames--'], array_slice($_SERVER['argv'], $i+1));
                 break;
             } else if (substr($_SERVER['argv'][$i], 0, 1) == '-') {
                     $this->usage();
@@ -171,7 +171,7 @@ 
     {
         if (class_exists('PHPTAL', false)) return;
 
-        $myphptal = dirname(__FILE__) . '/../classes/PHPTAL.php';
+        $myphptal = dirname(__FILE__).'/../classes/PHPTAL.php';
         if (file_exists($myphptal)) {
             require_once $myphptal;
         } else {
@@ -202,7 +202,7 @@ 
     }
 
     function acceptExtensions(array $ext) {
-        $this->accept_pattern = '/\.(?:' . implode('|', $ext) . ')$/i';
+        $this->accept_pattern = '/\.(?:'.implode('|', $ext).')$/i';
     }
 
     protected function reportProgress($symbol)
@@ -226,17 +226,17 @@ 
 
             if ($entry->isDir()) {
                 $this->reportProgress('.');
-                $this->scan($path . DIRECTORY_SEPARATOR . $filename);
+                $this->scan($path.DIRECTORY_SEPARATOR.$filename);
                 continue;
             }
 
-            if (! preg_match($this->accept_pattern, $filename)) {
+            if (!preg_match($this->accept_pattern, $filename)) {
                 $this->skipped++;
                 $this->skipped_filenames[$filename] = true;
                 continue;
             }
 
-            $result = $this->testFile($path . DIRECTORY_SEPARATOR . $filename);
+            $result = $this->testFile($path.DIRECTORY_SEPARATOR.$filename);
 
             if (self::TEST_OK == $result) {
                 $this->reportProgress('.');
@@ -258,25 +258,25 @@ 
     function testFile($fullpath)
     {
         try {
-            $this->checked ++;
+            $this->checked++;
             $phptal = new PHPTAL($fullpath);
             $phptal->setForceReparse(true);
             $phptal->prepare();
             return self::TEST_OK;
         }
-        catch(PHPTAL_UnknownModifierException $e) {
+        catch (PHPTAL_UnknownModifierException $e) {
             if ($this->skipUnknownModifiers && is_callable(array($e, 'getModifierName'))) {
                 $this->warnings[] = array(dirname($fullpath), basename($fullpath), "Unknown expression modifier: ".$e->getModifierName()." (use -i to include your custom modifier functions)", $e->getLine());
                 return self::TEST_SKIPPED;
             }
             $log_exception = $e;
         }
-        catch(Exception $e) {
+        catch (Exception $e) {
             $log_exception = $e;
         }
 
         // Takes exception from either of the two catch blocks above
-        $this->errors[] = array(dirname($fullpath) , basename($fullpath) , $log_exception->getMessage() , $log_exception->getLine());
+        $this->errors[] = array(dirname($fullpath), basename($fullpath), $log_exception->getMessage(), $log_exception->getLine());
         return self::TEST_ERROR;
     }
 }

classes/PHPTAL/Php/Attribute/PHPTAL/Cache.php

Spacing +4 added lines, -4 removed lines

@@ -59,9 +59,9 @@ 
             case 'm': $cache_len .= '*60'; /* no break */
         }
 
-        $cache_tag = '"'.addslashes( $this->phpelement->getQualifiedName() . ':' . $this->phpelement->getSourceLine()).'"';
+        $cache_tag = '"'.addslashes($this->phpelement->getQualifiedName().':'.$this->phpelement->getSourceLine()).'"';
 
-        $cache_per_expression = isset($matches[3])?trim($matches[3]):null;
+        $cache_per_expression = isset($matches[3]) ?trim($matches[3]) : null;
         if ($cache_per_expression == 'url') {
             $cache_tag .= '.$_SERVER["REQUEST_URI"]';
         } elseif ($cache_per_expression == 'nothing') {
@@ -72,11 +72,11 @@ 
              if (is_array($code)) throw new PHPTAL_ParserException("Chained expressions in per-cache directive are not supported",
                                                 $this->phpelement->getSourceFile(), $this->phpelement->getSourceLine());
 
-             $cache_tag = '('.$code.')."@".' . $cache_tag;
+             $cache_tag = '('.$code.')."@".'.$cache_tag;
         }
 
         $this->cache_filename_var = $codewriter->createTempVariable();
-        $codewriter->doSetVar($this->cache_filename_var, $codewriter->str($codewriter->getCacheFilesBaseName()).'.md5('.$cache_tag.')' );
+        $codewriter->doSetVar($this->cache_filename_var, $codewriter->str($codewriter->getCacheFilesBaseName()).'.md5('.$cache_tag.')');
 
         $cond = '!file_exists('.$this->cache_filename_var.') || time() - '.$cache_len.' >= filemtime('.$this->cache_filename_var.')';
 

classes/PHPTAL/Dom/SaxXmlParser.php

Spacing +16 added lines, -16 removed lines

@@ -116,12 +116,12 @@ 
             $builder->setSource($this->_file, $this->_line);
             $builder->onDocumentStart();
 
-            $i=0;
+            $i = 0;
             // remove BOM (UTF-8 byte order mark)...
             if (substr($src, 0, 3) === self::BOM_STR) {
-                $i=3;
+                $i = 3;
             }
-            for (; $i<$len; $i++) {
+            for (; $i < $len; $i++) {
                 $c = $src[$i]; // Change to substr($src, $i, 1); if you want to use mb_string.func_overload
 
                 if ($c === "\n") $builder->setSource($this->_file, ++$this->_line);
@@ -201,7 +201,7 @@ 
                         if ($c !== '>') {
                             $this->raiseError("Expected '/>', but found '/$c' inside tag < $tagname >");
                         }
-                        $mark = $i+1;   // mark text start
+                        $mark = $i+1; // mark text start
                         $state = self::ST_TEXT;
                         $builder->onElementStart($tagname, $attributes);
                         $builder->onElementClose($tagname);
@@ -210,7 +210,7 @@ 
                     case self::ST_TAG_BETWEEN_ATTRIBUTE:
                     case self::ST_TAG_ATTRIBUTES:
                         if ($c === '>') {
-                            $mark = $i+1;   // mark text start
+                            $mark = $i+1; // mark text start
                             $state = self::ST_TEXT;
                             $builder->onElementStart($tagname, $attributes);
                         } elseif ($c === '/') {
@@ -226,7 +226,7 @@ 
                     case self::ST_COMMENT:
                         if ($c === '>' && $i > $mark+4 && substr($src, $i-2, 2) === '--') {
 
-                            if (preg_match('/^-|--|-$/', substr($src, $mark +4, $i-$mark+1 -7))) {
+                            if (preg_match('/^-|--|-$/', substr($src, $mark+4, $i-$mark+1-7))) {
                                 $this->raiseError("Ill-formed comment. XML comments are not allowed to contain '--' or start/end with '-': ".substr($src, $mark+4, $i-$mark+1-7));
                             }
 
@@ -289,7 +289,7 @@ 
 
                             if ($c === '=') $state = self::ST_ATTR_VALUE;
                             else /* white char */ $state = self::ST_ATTR_EQ;
-                        } elseif ($c === '/' || $c==='>') {
+                        } elseif ($c === '/' || $c === '>') {
                             $attribute = substr($src, $mark, $i-$mark);
                             if (!$this->isValidQName($attribute)) {
                                 $this->raiseError("Invalid attribute name '$attribute'");
@@ -323,7 +323,7 @@ 
 
                             // PHPTAL's code generator assumes input is escaped for double-quoted strings. Single-quoted attributes need to be converted.
                             // FIXME: it should be escaped at later stage.
-                            $attributes[$attribute] = str_replace('"',"&quot;", $attributes[$attribute]);
+                            $attributes[$attribute] = str_replace('"', "&quot;", $attributes[$attribute]);
                             $state = self::ST_TAG_BETWEEN_ATTRIBUTE;
                         }
                         break;
@@ -347,7 +347,7 @@ 
 
             $builder->onDocumentEnd();
         }
-        catch(PHPTAL_TemplateException $e)
+        catch (PHPTAL_TemplateException $e)
         {
             $e->hintSrcPosition($this->_file, $this->_line);
             throw $e;
@@ -370,7 +370,7 @@ 
             // $match expression below somehow triggers quite deep recurrency and stack overflow in preg
             // to avoid this, check string bit by bit, omitting ASCII fragments.
             if (strlen($str) > 200) {
-                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/',$str,null,PREG_SPLIT_NO_EMPTY);
+                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/', $str, null, PREG_SPLIT_NO_EMPTY);
                 foreach ($chunks as $chunk) {
                     if (strlen($chunk) < 200) {
                         $this->checkEncoding($chunk);
@@ -389,11 +389,11 @@ 
                . '|\xED[\x80-\x9F][\x80-\xBF]'        // excluding surrogates
                . '|\xF0[\x90-\xBF][\x80-\xBF]{2}'     // planes 1-3
                . '|[\xF1-\xF3][\x80-\xBF]{3}'         // planes 4-15
-               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
+               . '|\xF4[\x80-\x8F][\x80-\xBF]{2}'; // plane 16
 
-            if (!preg_match('/^(?:(?>'.$match.'))+$/s',$str)) {
-                $res = preg_split('/((?>'.$match.')+)/s',$str,null,PREG_SPLIT_DELIM_CAPTURE);
-                for($i=0; $i < count($res); $i+=2)
+            if (!preg_match('/^(?:(?>'.$match.'))+$/s', $str)) {
+                $res = preg_split('/((?>'.$match.')+)/s', $str, null, PREG_SPLIT_DELIM_CAPTURE);
+                for ($i = 0; $i < count($res); $i += 2)
                 {
                     $res[$i] = self::convertBytesToEntities(array(1=>$res[$i]));
                 }
@@ -425,7 +425,7 @@ 
     private static function convertBytesToEntities(array $m)
     {
         $m = $m[1]; $out = '';
-        for($i=0; $i < strlen($m); $i++)
+        for ($i = 0; $i < strlen($m); $i++)
         {
             $out .= '&#X'.strtoupper(dechex(ord($m[$i]))).';';
         }
@@ -442,7 +442,7 @@ 
         /* <?php ?> blocks can't reliably work in attributes (due to escaping impossible in XML)
            so they have to be converted into special TALES expression
         */
-        $types = ini_get('short_open_tag')?'php|=|':'php';
+        $types = ini_get('short_open_tag') ? 'php|=|' : 'php';
         $str = preg_replace_callback("/<\?($types)(.*?)\?>/", array('self', 'convertPHPBlockToTALES'), $str);
 
         // corrects all non-entities and neutralizes potentially problematic CDATA end marker

classes/PHPTAL/Context.php

Spacing +10 added lines, -10 removed lines

@@ -101,7 +101,7 @@ 
      *
      * @return void
      */
-    public function setDocType($doctype,$called_from_macro)
+    public function setDocType($doctype, $called_from_macro)
     {
         // FIXME: this is temporary workaround for problem of DOCTYPE disappearing in cloned PHPTAL object (because clone keeps _parentContext)
         if (!$this->_docType) {
@@ -246,7 +246,7 @@ 
      */
     public function pushSlots()
     {
-        $this->_slotsStack[] =  $this->_slots;
+        $this->_slotsStack[] = $this->_slots;
         $this->_slots = array();
     }
 
@@ -320,7 +320,7 @@ 
         } else $pathinfo = '';
 
         if (!empty($basename)) {
-            $basename = "'" . $basename . "' ";
+            $basename = "'".$basename."' ";
         }
 
         if (is_array($base)) {
@@ -350,7 +350,7 @@ 
      * @access private
      * @return mixed
      */
-    public static function path($base, $path, $nothrow=false)
+    public static function path($base, $path, $nothrow = false)
     {
         if ($base === null) {
             if ($nothrow) return null;
@@ -413,7 +413,7 @@ 
                         $base = $base->__call($current, array());
                         continue;
                     }
-                    catch(BadMethodCallException $e) {}
+                    catch (BadMethodCallException $e) {}
                 }
 
                 if ($nothrow) {
@@ -426,7 +426,7 @@ 
             // array handling
             if (is_array($base)) {
                 // key or index
-                if (array_key_exists((string)$current, $base)) {
+                if (array_key_exists((string) $current, $base)) {
                     $base = $base[$current];
                     continue;
                 }
@@ -474,7 +474,7 @@ 
  * @see PHPTAL_Context::path()
  * @deprecated
  */
-function phptal_path($base, $path, $nothrow=false)
+function phptal_path($base, $path, $nothrow = false)
 {
     return PHPTAL_Context::path($base, $path, $nothrow);
 }
@@ -489,7 +489,7 @@ 
 function phptal_isempty($var)
 {
     return $var === null || $var === false || $var === ''
-           || ((is_array($var) || $var instanceof Countable) && count($var)===0);
+           || ((is_array($var) || $var instanceof Countable) && count($var) === 0);
 }
 
 /**
@@ -528,7 +528,7 @@ 
     if (is_string($var)) {
         return $var;
     } elseif (is_bool($var)) {
-        return (int)$var;
+        return (int) $var;
     } elseif (is_array($var)) {
         return implode(', ', array_map('phptal_tostring', $var));
     } elseif ($var instanceof SimpleXMLElement) {
@@ -542,7 +542,7 @@ 
             return $xml;
         }
     }
-    return (string)phptal_unravel_closure($var);
+    return (string) phptal_unravel_closure($var);
 }
 
 /**