CS fixes.

Author: simensen

src/dflydev/util/antPathMatcher/AntPathMatcher.php

@@ -13,12 +13,12 @@
 
 /**
  * Default implementation for Ant-style path patterns.
- * 
+ *
  * <p>This was very much inspired (read: "kindly borrowed") from <a href="http://www.springsource.org/">Spring</a>.
  *
  */
-class AntPathMatcher implements IAntPathMatcher {
-
+class AntPathMatcher implements IAntPathMatcher
+{
     /**
      * (non-PHPdoc)
      * @see dflydev\util\antPathMatcher.IAntPathMatcher::isPattern()
@@ -48,9 +48,9 @@ public function matchStart($pattern, $path)
 
     /**
      * Actually match the given <code>path</code> against the given <code>pattern</code>.
-     * @param string $pattern
-     * @param string $path
-     * @param boolean $fullMatch
+     * @param  string  $pattern
+     * @param  string  $path
+     * @param  boolean $fullMatch
      * @return boolean
      */
     protected function doMatch($pattern, $path, $fullMatch)
@@ -70,7 +70,7 @@ protected function doMatch($pattern, $path, $fullMatch)
         $pattIdxEnd = count($pattDirs) - 1;
         $pathIdxStart = 0;
         $pathIdxEnd = count($pathDirs) - 1;
-        
+
         // Match all elements up to the first **
         while ($pattIdxStart <= $pattIdxEnd and $pathIdxStart <= $pathIdxEnd) {
             $patDir = $pattDirs[$pattIdxStart];
@@ -101,17 +101,16 @@ protected function doMatch($pattern, $path, $fullMatch)
                     return false;
                 }
             }
+
             return false;
-        }
-        else if ($pattIdxStart > $pattIdxEnd) {
+        } elseif ($pattIdxStart > $pattIdxEnd) {
             // String not exhausted, but pattern is. Failure.
             return false;
-        }
-        else if (!$fullMatch and "**" == $pattDirs[$pattIdxStart]) {
+        } elseif (!$fullMatch and "**" == $pattDirs[$pattIdxStart]) {
             // Path start definitely matches due to "**" part in pattern.
             return true;
         }
-        
+
         // up to last '**'
         while ($pattIdxStart <= $pattIdxEnd and $pathIdxStart <= $pathIdxEnd) {
             $patDir = $pattDirs[$pattIdxEnd];
@@ -131,6 +130,7 @@ protected function doMatch($pattern, $path, $fullMatch)
                     return false;
                 }
             }
+
             return true;
         }
 
@@ -153,7 +153,7 @@ protected function doMatch($pattern, $path, $fullMatch)
             $patLength = ($patIdxTmp - $pattIdxStart - 1);
             $strLength = ($pathIdxEnd - $pathIdxStart + 1);
             $foundIdx = -1;
-            
+
             for ($i = 0; $i <= $strLength - $patLength; $i++) {
                 for ($j = 0; $j < $patLength; $j++) {
                     $subPat = $pattDirs[$pattIdxStart + $j + 1];
@@ -165,44 +165,45 @@ protected function doMatch($pattern, $path, $fullMatch)
                 $foundIdx = $pathIdxStart + $i;
                 break;
             }
-            
+
             if ($foundIdx == -1) {
                 return false;
             }
-            
+
             $pattIdxStart = $patIdxTmp;
             $pathIdxStart = $foundIdx + $patLength;
-            
+
         }
-        
+
         for ($i = $pattIdxStart; $i <= $pattIdxEnd; $i++) {
             if (!'**' == $pattDirs[$i]) {
                 return false;
             }
         }
 
         return true;
-    
+
     }
-    
+
     protected function tokenizeToStringArray($str, $delimiter = DIRECTORY_SEPARATOR, $trimTokens = true, $ignoreEmptyTokens = true)
     {
         if ($str === null) { return null; }
         $tokens = array();
-        foreach (explode($delimiter, $str) as $token) {  
+        foreach (explode($delimiter, $str) as $token) {
             if ($trimTokens) {
                 $token = trim($token);
             }
             if (!$ignoreEmptyTokens or strlen($token)>0) {
                 $tokens[] = $token;
             }
         }
+
         return $tokens;
     }
-    
+
     private function matchStringsCallback($matches)
     {
-        switch($matches[0]) {
+        switch ($matches[0]) {
             case '?':
                 return '.';
                 break;
@@ -219,7 +220,8 @@ private function matchStringsCallback($matches)
     protected function matchStrings($pattern, $str)
     {
         $re = preg_replace_callback('([\?\*\.\+])', array($this, 'matchStringsCallback'), $pattern);
+
         return preg_match('/'.$re.'/', $str);
     }
 
-}
+}

src/dflydev/util/antPathMatcher/IAntPathMatcher.php

@@ -29,29 +29,29 @@ interface IAntPathMatcher {
      * by an implementation of this interface? If this method returns
      * <code>false</code> then the <code>match*</code> methods do not need to be
      * called since direct string comparisons will lead to the same results.
-     * 
+     *
      * @return boolean
      */
     public function isPattern($path);
 
     /**
      * Match the given <code>path</code> against the given <code>pattern</code>.
-     * @param string $pattern
-     * @param string $path
+     * @param  string  $pattern
+     * @param  string  $path
      * @return boolean
      */
     public function match($pattern, $path);
 
     /**
      * Match the given <code>path</code> against the corresponding part of the
      * given <code>pattern</code>.
-     * 
+     *
      * Determines whether the pattern at least matches as far as the given base
      * path goes, assuming that a full path may then match as well.
-     * @param string $pattern
-     * @param string $path
+     * @param  string  $pattern
+     * @param  string  $path
      * @return boolean
      */
     public function matchStart($pattern, $path);
 
-}
+}