horros / agavi2

src/config/RoutingConfigHandler.class.php

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 namespace Agavi\Config;
 
 use Agavi\Config\Util\Dom\XmlConfigDomElement;
-use Agavi\Config\Util\Dom\XmlConfigDomNode;
 use Agavi\Core\Context;
 use Agavi\Config\XmlConfigHandler;
 use Agavi\Config\Util\Dom\XmlConfigDomDocument;

Spacing +5 added lines, -5 removed lines

@@ -111,7 +111,7 @@ 
             $pattern = Toolkit::expandDirectives($route->getAttribute('pattern'));
             $opts = array();
             if ($route->hasAttribute('imply')) {
-                $opts['imply']              = Toolkit::literalize($route->getAttribute('imply'));
+                $opts['imply'] = Toolkit::literalize($route->getAttribute('imply'));
             }
             if ($route->hasAttribute('cut')) {
                 $opts['cut']                    = Toolkit::literalize($route->getAttribute('cut'));
@@ -123,14 +123,14 @@ 
                 $opts['name']                   = Toolkit::expandDirectives($route->getAttribute('name'));
             }
             if ($route->hasAttribute('source')) {
-                $opts['source']             = Toolkit::expandDirectives($route->getAttribute('source'));
+                $opts['source'] = Toolkit::expandDirectives($route->getAttribute('source'));
             }
             if ($route->hasAttribute('constraint')) {
-                $opts['constraint']     = array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
+                $opts['constraint'] = array_map('trim', explode(' ', trim(Toolkit::expandDirectives($route->getAttribute('constraint')))));
             }
             // values which will be set when the route matched
             if ($route->hasAttribute('controller')) {
-                $opts['controller']             = Toolkit::expandDirectives($route->getAttribute('controller'));
+                $opts['controller'] = Toolkit::expandDirectives($route->getAttribute('controller'));
             }
             if ($route->hasAttribute('locale')) {
                 $opts['locale']             = Toolkit::expandDirectives($route->getAttribute('locale'));
@@ -142,7 +142,7 @@ 
                 $opts['module']             = Toolkit::expandDirectives($route->getAttribute('module'));
             }
             if ($route->hasAttribute('output_type')) {
-                $opts['output_type']    = Toolkit::expandDirectives($route->getAttribute('output_type'));
+                $opts['output_type'] = Toolkit::expandDirectives($route->getAttribute('output_type'));
             }
 
             if ($route->has('ignores')) {

src/date/SimpleTimeZone.class.php

Doc Comments +13 added lines, -1 removed lines

@@ -452,6 +452,7 @@ 
      *                 description for an example.
      * @param      float $month Whether the time is local wall time, local standard time,
      *                   or UTC time. Default is local wall time.
+     * @param double $mode
      *
      * @author     Dominik del Bondio <ddb@bitxtender.com>
      * @author     The ICU Project
@@ -861,7 +862,7 @@ 
      * @param      int $day The day-in-month of the given date.
      * @param      int $dayOfWeek The day-of-week of the given date.
      * @param      int $millis The millis in day in <em>standard</em> local time.
-     * @param      int $monthLengthThe length of the given month in days.
+     * @param      integer $monthLength length of the given month in days.
      * @param      int $prevMonthLength Length of the previous month in days.
      *
      * @return     int The offset to add *to* GMT to get local time.
@@ -1119,6 +1120,17 @@ 
      * millis are compared directly against the ruleMillis, so any
      * standard-daylight adjustments must be handled by the caller.
      *
+     * @param integer $month
+     * @param integer $prevMonthLen
+     * @param integer $dayOfMonth
+     * @param integer $dayOfWeek
+     * @param integer $millis
+     * @param integer $millisDelta
+     * @param integer $ruleMode
+     * @param integer $ruleMonth
+     * @param integer $ruleDayOfWeek
+     * @param integer $ruleDay
+     * @param integer $ruleMillis
      * @return     int 1 if the date is after the rule date, -1 if the date is
      *                 before the rule date, or 0 if the date is equal to the rule
      *                 date.

Spacing +4 added lines, -4 removed lines

@@ -1421,16 +1421,16 @@
         }
     }
 
-    private $startMonth, $startDay, $startDayOfWeek;   // the month, day, DOW, and time DST starts
+    private $startMonth, $startDay, $startDayOfWeek; // the month, day, DOW, and time DST starts
     private $startTime;
     private $startTimeMode, $endTimeMode; // Mode for startTime, endTime; see TimeMode
     private $endMonth, $endDay, $endDayOfWeek; // the month, day, DOW, and time DST ends
     private $endTime;
-    private $startYear;  // the year these DST rules took effect
-    private $rawOffset;  // the TimeZone's raw GMT offset
+    private $startYear; // the year these DST rules took effect
+    private $rawOffset; // the TimeZone's raw GMT offset
     private $useDaylight; // flag indicating whether this TimeZone uses DST
     private static $STATICMONTHLENGTH = array(31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31);
-    private $startMode, $endMode;   // flags indicating what kind of rules the DST rules are
+    private $startMode, $endMode; // flags indicating what kind of rules the DST rules are
 
     /**
      * A positive value indicating the amount of time saved during DST in ms.

src/filter/FormPopulationFilter.class.php

Unused Use Statements -1 removed lines

@@ -16,7 +16,6 @@
 use Agavi\Core\Context;
 use Agavi\Dispatcher\ExecutionContainer;
 use Agavi\Exception\AgaviException;
-use Agavi\Exception\FilterException;
 use Agavi\Exception\ParseException;
 use Agavi\Logging\LoggerInterface;
 use Agavi\Request\RequestDataHolder;

Spacing +6 added lines, -6 removed lines

@@ -533,7 +533,7 @@ 
                     if (is_array($value)) {
                         $value = array_map('strval', $value);
                     } else {
-                        $value = (string) $value;
+                        $value = (string)$value;
                     }
                 }
 
@@ -1049,15 +1049,15 @@ 
 
         // and "clean up" some of the params just in case the user messed up
 
-        $errorClassMap = (array) $this->getParameter('error_class_map');
+        $errorClassMap = (array)$this->getParameter('error_class_map');
         // append a match-all expression to the map, which assigns the default error class
         $errorClassMap['self::${htmlnsPrefix}*'] = $this->getParameter('error_class');
         $this->setParameter('error_class_map', $errorClassMap);
 
-        $this->setParameter('methods', (array) $this->getParameter('methods'));
+        $this->setParameter('methods', (array)$this->getParameter('methods'));
 
         if ($ot = $this->getParameter('output_types')) {
-            $this->setParameter('output_types', (array) $ot);
+            $this->setParameter('output_types', (array)$ot);
         }
         
         $savexmlOptions = 0;
@@ -1070,7 +1070,7 @@ 
         }
         $this->setParameter('savexml_options', $savexmlOptions);
 
-        $ignoreParseErrors =& $this->getParameter('ignore_parse_errors');
+        $ignoreParseErrors = & $this->getParameter('ignore_parse_errors');
         if (is_string($ignoreParseErrors) && defined($ignoreParseErrors)) {
             $ignoreParseErrors = constant($ignoreParseErrors);
         }
@@ -1081,7 +1081,7 @@ 
             $ignoreParseErrors = LIBXML_ERR_NONE;
         }
         
-        $logParseErrors =& $this->getParameter('log_parse_errors');
+        $logParseErrors = & $this->getParameter('log_parse_errors');
         if (is_string($logParseErrors) && defined($logParseErrors)) {
             $logParseErrors = constant($logParseErrors);
         }

src/build/Agavi/Build/Console/Command/ProjectCreate.php

Unused Use Statements -1 removed lines

@@ -22,7 +22,6 @@
  **/
 namespace Agavi\Build\Console\Command;
 
-use Symfony\Component\Console\Helper\Helper;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\Output;

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
         if (is_array($tmp)) {
             array_walk(
                 $tmp,
-                function (&$v) {
+                function(&$v) {
                     $v = ucfirst($v);
                 }
             );
@@ -146,7 +146,7 @@ 
 
             // Copy config.php
             $fc->copy($templates . '/app/config.php.tmpl', $projectLocation . '/app/config.php',
-                function ($data, $params) {
+                function($data, $params) {
                     return $this->projectTokenReplacer($data, $params);
                 }, $defaultParams);
 
@@ -158,19 +158,19 @@ 
 
             // Base controller
             $fc->copy($templates . '/app/lib/controller/BaseController.class.php.tmpl', $projectLocation . '/app/lib/controller/' . $projectPrefix . 'BaseController.class.php',
-                function ($data, $params) {
+                function($data, $params) {
                     return $this->projectTokenReplacer($data, $params);
                 }, $defaultParams);
 
             // Base model
             $fc->copy($templates . '/app/lib/model/BaseModel.class.php.tmpl', $projectLocation . '/app/lib/model/' . $projectPrefix . 'BaseModel.class.php',
-                function ($data, $params) {
+                function($data, $params) {
                     return $this->projectTokenReplacer($data, $params);
                 }, $defaultParams);
 
             // Base view
             $fc->copy($templates . '/app/lib/view/BaseView.class.php.tmpl', $projectLocation . '/app/lib/view/' . $projectPrefix . 'BaseView.class.php',
-                function ($data, $params) {
+                function($data, $params) {
                     return $this->projectTokenReplacer($data, $params);
                 }, $defaultParams);
 
@@ -178,7 +178,7 @@ 
             @mkdir($projectLocation . '/app/config', 0755, true);
             foreach (glob($this->getSourceDir() . '/build/templates/app/config/*.xml.tmpl') as $file) {
                 $fc->copy($file, $projectLocation . '/app/config/' . basename($file, '.tmpl'),
-                    function ($data, $params) {
+                    function($data, $params) {
                         return $this->projectTokenReplacer($data, $params);
                     }, $defaultParams);
             }

src/build/build.php

Indentation -1 removed lines

@@ -14,7 +14,6 @@
 
 /**
  * Command-line script for Agavi2
-
  * @author     Markus Lervik <markuslervik1234@gmail.com>
  * @copyright  Authors
  * @copyright  The Agavi Project

Spacing +3 added lines, -3 removed lines

@@ -30,9 +30,9 @@
 
 // Autoloader for our console application. We don't want
 // to pollute Composer's autoloader
-spl_autoload_register(function ($class) {
-    if (file_exists(__DIR__  . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php')) {
-        include (__DIR__ . DIRECTORY_SEPARATOR .  str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php');
+spl_autoload_register(function($class) {
+    if (file_exists(__DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php')) {
+        include (__DIR__ . DIRECTORY_SEPARATOR . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php');
     }
 });
 

src/build/Agavi/Build/Console/Command/ProjectWizard.php

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\Output;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;

Spacing +5 added lines, -5 removed lines

@@ -127,7 +127,7 @@ 
         $fc = new FileCopyHelper();
         $fc->copy($this->getSourceDir() . '/build/templates/defaults/app/modules/views/WelcomeSuccessView.class.php.tmpl',
             $projectLocation . '/app/modules/Welcome/views/IndexSuccessView.class.php',
-            function ($data, $params) {
+            function($data, $params) {
                 return str_replace([
                     '%%PROJECT_PREFIX%%',
                     '%%MODULE_NAME%%',
@@ -154,9 +154,9 @@ 
         copy($this->getSourceDir() . '/build/templates/defaults/app/modules/templates/WelcomeSuccess.php.tmpl',
             $projectLocation . '/app/modules/Welcome/templates/IndexSuccess.php');
 
-        mkdir($settings['project']['pub']. '/welcome', 0755, true);
-        copy($this->getSourceDir() . '/build/templates/defaults/pub/welcome/bg.png', $settings['project']['pub']. '/welcome/bg.png');
-        copy($this->getSourceDir() . '/build/templates/defaults/pub/welcome/plant.png', $settings['project']['pub']. '/welcome/plant.png');
+        mkdir($settings['project']['pub'] . '/welcome', 0755, true);
+        copy($this->getSourceDir() . '/build/templates/defaults/pub/welcome/bg.png', $settings['project']['pub'] . '/welcome/bg.png');
+        copy($this->getSourceDir() . '/build/templates/defaults/pub/welcome/plant.png', $settings['project']['pub'] . '/welcome/plant.png');
 
         // Add the Default-module
         $dcCommand = $this->getApplication()->find('agavi:module');
@@ -172,7 +172,7 @@ 
 
         // Copy the default settings
         foreach (glob($this->getSourceDir() . '/build/templates/defaults/app/config/*.xml.tmpl') as $file) {
-            $fc->copy($file, $projectLocation . '/app/config/' . basename($file, '.tmpl'), function ($data, $params) {
+            $fc->copy($file, $projectLocation . '/app/config/' . basename($file, '.tmpl'), function($data, $params) {
                 return str_replace([
                     '%%AGAVI_SOURCE_LOCATION%%',
                     '%%PROJECT_LOCATION%%',

src/build/Agavi/Build/Console/Command/ControllerCreate.php

Doc Comments +4 added lines

@@ -408,6 +408,10 @@
         return $code;
     }
 
+    /**
+     * @param string $file
+     * @param string $xpath
+     */
     private function writeSettings($file, $xpath, $value, OutputInterface $output)
     {
         $document = new \DOMDocument();

Spacing +4 added lines, -4 removed lines

@@ -169,7 +169,7 @@ 
 
         $fc->copy($this->getSourceDir() . '/build/templates/app/modules/controllers/Controller.class.php.tmpl',
             $controllerFile,
-            function ($data, $params) {
+            function($data, $params) {
                 return str_replace([
                     '%%PROJECT_PREFIX%%',
                     '%%MODULE_NAME%%',
@@ -206,7 +206,7 @@ 
 
         $fc->copy($this->getSourceDir() . '/build/templates/app/modules/validate/controller.xml.tmpl',
             $validatorFile,
-            function ($data, $params) {
+            function($data, $params) {
                 return str_replace([
                     '%%MODULE_NAME%%',
                 ], [
@@ -226,7 +226,7 @@ 
 
         $fc->copy($this->getSourceDir() . '/build/templates/app/modules/cache/controller.xml.tmpl',
             $cacheFile,
-            function ($data, $params) {
+            function($data, $params) {
                 return str_replace([
                     '%%MODULE_NAME%%',
                 ], [
@@ -305,7 +305,7 @@ 
             }
 
             $fc->copy($srcview, $viewFile,
-                function ($data, $params) {
+                function($data, $params) {
                     return str_replace([
                         '%%PROJECT_PREFIX%%',
                         '%%MODULE_NAME%%',

src/build/Agavi/Build/Console/Command/PubCreate.php

Unused Use Statements -2 removed lines

@@ -23,8 +23,6 @@
 namespace Agavi\Build\Console\Command;
 
 use Symfony\Component\Console\Exception\InvalidArgumentException;
-use Symfony\Component\Console\Helper\Helper;
-use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;

Spacing +2 added lines, -2 removed lines

@@ -93,7 +93,7 @@ 
         /**
          * Copy the files and replace the tokens in the template files
          */
-        $fc->copy($this->getSourceDir() . '/build/templates/pub/index.php.tmpl', $dir . '/index.php', function ($data, $params) {
+        $fc->copy($this->getSourceDir() . '/build/templates/pub/index.php.tmpl', $dir . '/index.php', function($data, $params) {
             return str_replace([
                 '%%AGAVI_SOURCE_LOCATION%%',
                 '%%PUBLIC_ENVIRONMENT%%',
@@ -108,7 +108,7 @@ 
             [$environment]
         );
 
-        $fc->copy($this->getSourceDir() . '/build/templates/pub/dot.htaccess.tmpl', $dir . '/.htaccess', function ($data, $params) {
+        $fc->copy($this->getSourceDir() . '/build/templates/pub/dot.htaccess.tmpl', $dir . '/.htaccess', function($data, $params) {
             return str_replace([
                 '%%AGAVI_SOURCE_LOCATION%%',
                 '%%PUBLIC_ENVIRONMENT%%',

src/config/ConfigValueHolder.class.php

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 
 namespace Agavi\Config;
 
-use Agavi\Config\Util\Dom\XmlConfigDomElement;
 use Agavi\Util\Inflector;
 
 /**