EC-CUBE / ec-cube

src/Eccube/Form/Type/Admin/PaymentRegisterType.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
 {
     protected $app;
 
+    /**
+     * @param \Silex\Application $app
+     */
     public function __construct($app)
     {
         $this->app = $app;

eccube_install.php

Spacing +13 added lines, -14 removed lines

@@ -31,7 +31,7 @@ 
 out('EC-CUBE3 installer use database driver of ', null, false);
 
 $database_driver = 'pdo_sqlite';
-switch($argv[1]) {
+switch ($argv[1]) {
     case 'mysql':
         $database_driver = 'pdo_mysql';
         break;
@@ -157,8 +157,7 @@ 
     putenv('MAIL_PASS='.(getenv('MAIL_PASS') ? getenv('MAIL_PASS') : null));
     putenv('ADMIN_ROUTE='.(getenv('ADMIN_ROUTE') ? getenv('ADMIN_ROUTE') : 'admin'));
     putenv('ROOT_URLPATH='.(getenv('ROOT_URLPATH') ? getenv('ROOT_URLPATH') : null));
-    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') :
-                          substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
+    putenv('AUTH_MAGIC='.(getenv('AUTH_MAGIC') ? getenv('AUTH_MAGIC') : substr(str_replace(array('/', '+', '='), '', base64_encode(openssl_random_pseudo_bytes(32 * 2))), 0, 32)));
 }
 
 function getExampleVariables()
@@ -357,15 +356,15 @@ 
     foreach ($finder as $content) {
         $permission = $content->getPerms();
         // see also http://www.php.net/fileperms
-        if (!($permission & 0x0010) || !($permission & 0x0002)) {
+        if (!($permission&0x0010) || !($permission&0x0002)) {
             $realPath = $content->getRealPath();
             if ($verbose) {
                 out(sprintf('%s %s to ', $realPath, substr(sprintf('%o', $permission), -4)), 'info', false);
             }
-            $permission = !($permission & 0x0020) ? $permission += 040 : $permission; // g+r
-            $permission = !($permission & 0x0010) ? $permission += 020 : $permission; // g+w
-            $permission = !($permission & 0x0004) ? $permission += 04 : $permission;  // o+r
-            $permission = !($permission & 0x0002) ? $permission += 02 : $permission;  // o+w
+            $permission = !($permission&0x0020) ? $permission += 040 : $permission; // g+r
+            $permission = !($permission&0x0010) ? $permission += 020 : $permission; // g+w
+            $permission = !($permission&0x0004) ? $permission += 04 : $permission; // o+r
+            $permission = !($permission&0x0002) ? $permission += 02 : $permission; // o+w
             $result = chmod($realPath, $permission);
             if ($verbose) {
                 if ($result) {
@@ -396,13 +395,13 @@ 
 
 function getConfig()
 {
-    $config = array (
+    $config = array(
         'auth_magic' => getenv('AUTH_MAGIC'),
         'password_hash_algos' => 'sha256',
         'shop_name' => getenv('SHOP_NAME'),
         'force_ssl' => NULL,
         'admin_allow_host' =>
-        array (
+        array(
         ),
         'cookie_lifetime' => 0,
         'locale' => 'ja',
@@ -414,9 +413,9 @@ 
 
 function getDatabaseConfig($database_driver)
 {
-    $database = array (
+    $database = array(
         'database' =>
-        array (
+        array(
             'driver' => $database_driver,
         )
     );
@@ -443,9 +442,9 @@ 
 
 function getMailConfig()
 {
-    $mail = array (
+    $mail = array(
         'mail' =>
-        array (
+        array(
             'transport' => getenv('MAIL_BACKEND'),
             'host' => getenv('MAIL_HOST'),
             'port' => getenv('MAIL_PORT'),

src/Eccube/Log/Monolog/Helper/LogHelper.php

Spacing +1 added lines, -1 removed lines

@@ -100,7 +100,7 @@
         $webProcessor = new EccubeWebProcessor();
         $uidProcessor = new UidProcessor(8);
 
-        $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) {
+        $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) {
             // ログフォーマットに出力する値を独自に設定
 
             $record['level_name'] = sprintf("%-5s", $record['level_name']);

src/Eccube/ServiceProvider/LogServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -21,17 +21,17 @@ 
         $app->register(new \Silex\Provider\MonologServiceProvider());
 
         // Log
-        $app['eccube.logger'] = $app->share(function ($app) {
+        $app['eccube.logger'] = $app->share(function($app) {
             return new Logger($app);
         });
 
         // ヘルパー作成
-        $app['eccube.monolog.helper'] = $app->share(function ($app) {
+        $app['eccube.monolog.helper'] = $app->share(function($app) {
             return new LogHelper($app);
         });
 
         // ログクラス作成ファクトリー
-        $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) {
+        $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) {
 
             $log = new $app['monolog.logger.class']($channelValues['name']);
 
@@ -46,7 +46,7 @@ 
         // monologの設定は除外
         unset($channels['monolog']);
         foreach ($channels as $channel => $channelValues) {
-            $app['monolog.logger.'.$channel] = $app->share(function ($app) use ($channelValues) {
+            $app['monolog.logger.'.$channel] = $app->share(function($app) use ($channelValues) {
                 return $app['eccube.monolog.factory']($channelValues);
             });
         }
@@ -54,15 +54,15 @@ 
         // MonologServiceProviderで定義されているmonolog.handlerの置換
         $channelValues = $app['config']['log']['channel']['monolog'];
         $app['monolog.name'] = $channelValues['name'];
-        $app['monolog.handler'] = $app->share(function ($app) use ($channelValues) {
+        $app['monolog.handler'] = $app->share(function($app) use ($channelValues) {
             return $app['eccube.monolog.helper']->getHandler($channelValues);
         });
 
-        $app['eccube.monolog.listener'] = $app->share(function () use ($app) {
+        $app['eccube.monolog.listener'] = $app->share(function() use ($app) {
             return new LogListener($app['eccube.logger']);
         });
 
-        $app['listener.requestdump'] = $app->share(function ($app) {
+        $app['listener.requestdump'] = $app->share(function($app) {
             return new \Eccube\EventListener\RequestDumpListener($app);
         });
     }

src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryWalker.php

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\TreeWalkerAdapter;
 use Doctrine\ORM\Query\AST\Functions\IdentityFunction;

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
         );
 
         $pathExpression = new PathExpression(
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
             $rootAlias,
             $identifier
         );
@@ -104,13 +104,13 @@ 
 
         if (isset($AST->orderByClause)) {
             foreach ($AST->orderByClause->orderByItems as $item) {
-                if ( ! $item->expression instanceof PathExpression) {
+                if (!$item->expression instanceof PathExpression) {
                     continue;
                 }
                 
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
                     $this->createSelectExpressionItem($item->expression),
-                    '_dctrn_ord' . $this->_aliasCounter++
+                    '_dctrn_ord'.$this->_aliasCounter++
                 );
             }
         }
@@ -145,7 +145,7 @@ 
                     && isset($queryComponents[$expression->identificationVariable])) {
                     $queryComponent = $queryComponents[$expression->identificationVariable];
                     if (isset($queryComponent['parent'])
-                        && $queryComponent['relation']['type'] & ClassMetadataInfo::TO_MANY) {
+                        && $queryComponent['relation']['type']&ClassMetadataInfo::TO_MANY) {
                         throw new \RuntimeException("Cannot select distinct identifiers from query with LIMIT and ORDER BY on a column from a fetch joined to-many association. Use output walkers.");
                     }
                 }

src/Eccube/Doctrine/ORM/Tools/Pagination/Paginator.php

Doc Comments +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     /**
      * Constructor.
      *
-     * @param Query|QueryBuilder $query               A Doctrine ORM query or query builder.
+     * @param Query $query               A Doctrine ORM query or query builder.
      * @param boolean            $fetchJoinCollection Whether the query joins a collection (true by default).
      */
     public function __construct($query, $fetchJoinCollection = true)

Spacing +3 added lines, -3 removed lines

@@ -121,7 +121,7 @@ 
         if ($this->count === null) {
             try {
                 $this->count = array_sum(array_map('current', $this->getCountQuery()->getScalarResult()));
-            } catch(NoResultException $e) {
+            } catch (NoResultException $e) {
                 $this->count = 0;
             }
         }
@@ -241,7 +241,7 @@ 
         /* @var $countQuery Query */
         $countQuery = $this->cloneQuery($this->query);
 
-        if ( ! $countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
+        if (!$countQuery->hasHint(CountWalker::HINT_DISTINCT)) {
             $countQuery->setHint(CountWalker::HINT_DISTINCT, true);
         }
 
@@ -267,7 +267,7 @@ 
         foreach ($parameters as $key => $parameter) {
             $parameterName = $parameter->getName();
 
-            if( ! (isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
+            if (!(isset($parameterMappings[$parameterName]) || array_key_exists($parameterName, $parameterMappings))) {
                 unset($parameters[$key]);
             }
         }

src/Eccube/Doctrine/ORM/Tools/Pagination/WhereInWalker.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
             $pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
         }
 
-        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
+        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
         $pathExpression->type = $pathType;
 
         $count = $this->_getQuery()->getHint(self::HINT_PAGINATOR_ID_COUNT);
@@ -100,7 +100,7 @@ 
                 array($pathExpression)
             );
             $expression = new InExpression($arithmeticExpression);
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
 
         } else {
             $expression = new NullComparisonExpression($pathExpression);

src/Eccube/Doctrine/ORM/Tools/Pagination/CountWalker.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         }
 
         $pathExpression = new PathExpression(
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
             $identifierFieldName
         );
         $pathExpression->type = $pathType;

src/Eccube/Doctrine/ORM/Tools/Pagination/LimitSubqueryOutputWalker.php

Unused Use Statements -9 removed lines

@@ -18,18 +18,9 @@
 use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
 use Doctrine\DBAL\Platforms\SQLAnywherePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
-use Doctrine\ORM\Query\AST\ArithmeticExpression;
-use Doctrine\ORM\Query\AST\ArithmeticFactor;
-use Doctrine\ORM\Query\AST\ArithmeticTerm;
-use Doctrine\ORM\Query\AST\Literal;
 use Doctrine\ORM\Query\AST\OrderByClause;
-use Doctrine\ORM\Query\AST\OrderByItem;
 use Doctrine\ORM\Query\AST\PartialObjectExpression;
-use Doctrine\ORM\Query\AST\PathExpression;
 use Doctrine\ORM\Query\AST\SelectExpression;
-use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
-use Doctrine\ORM\Query\Expr\OrderBy;
-use Doctrine\ORM\Query\Expr\Select;
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\AST\SelectStatement;
 

Spacing +7 added lines, -7 removed lines

@@ -209,8 +209,8 @@ 
         $sqlIdentifier = $this->getSQLIdentifier($AST);
 
         if ($hasOrderBy) {
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier);
-            $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier);
+            $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
         }
 
         // Build the counter query
@@ -221,7 +221,7 @@ 
         );
 
         if ($hasOrderBy) {
-            $sql .= $orderGroupBy . $outerOrderBy;
+            $sql .= $orderGroupBy.$outerOrderBy;
         }
 
         // Apply the limit and offset.
@@ -368,7 +368,7 @@ 
     {
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct
         // statement
-        if (! $orderByClause instanceof OrderByClause) {
+        if (!$orderByClause instanceof OrderByClause) {
             return $sql;
         }
 
@@ -404,7 +404,7 @@ 
             = array();
 
         // Generate DQL alias -> SQL table alias mapping
-        foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) {
+        foreach (array_keys($this->rsm->aliasMap) as $dqlAlias) {
             $dqlAliasToClassMap[$dqlAlias] = $class = $this->queryComponents[$dqlAlias]['metadata'];
             $dqlAliasToSqlTableAliasMap[$dqlAlias] = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
         }
@@ -413,7 +413,7 @@ 
         $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
 
         // Generate search patterns for each field's path expression in the order by clause
-        foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
+        foreach ($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
             $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias];
             $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias];
 
@@ -449,7 +449,7 @@ 
             $replacements[] = $fieldAlias;
         }
 
-        foreach($orderByClause->orderByItems as $orderByItem) {
+        foreach ($orderByClause->orderByItems as $orderByItem) {
             // Walk order by item to get string representation of it
             $orderByItemString = $this->walkOrderByItem($orderByItem);