EC-CUBE / ec-cube

src/Eccube/Repository/Master/OrderStatusRepository.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 
         foreach ($criteria as $col => $val) {
             $qb->andWhere($qb->expr()->notIn('o.'.$col, ':'.$col))
-                ->setParameter($col, (array)$val);
+                ->setParameter($col, (array) $val);
         }
 
         if (is_array($orderBy)) {

src/Eccube/Service/PluginService.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
             if (!empty($config_cache)) {
                 $meta = $config_cache;
             } else {
-                $meta = $this->readYml($dir . '/config.yml');
+                $meta = $this->readYml($dir.'/config.yml');
             }
         } catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
             throw new PluginException($e->getMessage(), $e->getCode(), $e);

Doc Comments +21 added lines

@@ -77,6 +77,9 @@ 
     const CONFIG_YML = 'config.yml';
     const EVENT_YML = 'event.yml';
 
+    /**
+     * @param string $path
+     */
     public function install($path, $source = 0)
     {
         $pluginBaseDir = null;
@@ -137,6 +140,9 @@ 
         }
     }
 
+    /**
+     * @param string $dir
+     */
     public function unpackPluginArchive($archive, $dir)
     {
         $extension = pathinfo($archive, PATHINFO_EXTENSION);
@@ -196,6 +202,9 @@ 
         }
     }
 
+    /**
+     * @param string $yml
+     */
     public function readYml($yml)
     {
         if (file_exists($yml)) {
@@ -213,6 +222,9 @@ 
         // ディレクトリ名などに使われれるので厳しめ
     }
 
+    /**
+     * @param string $path
+     */
     public function deleteFile($path)
     {
         $f = new Filesystem();
@@ -232,6 +244,9 @@ 
         return $this->appConfig['plugin_realdir'].'/'.$name;
     }
 
+    /**
+     * @param string $d
+     */
     public function createPluginDir($d)
     {
         $b = @mkdir($d);
@@ -291,6 +306,9 @@ 
         return $p;
     }
 
+    /**
+     * @param string $method
+     */
     public function callPluginManagerMethod($meta, $method)
     {
         $class = '\\Plugin'.'\\'.$meta['code'].'\\'.'PluginManager';
@@ -363,6 +381,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $path
+     */
     public function update(\Eccube\Entity\Plugin $plugin, $path)
     {
         $pluginBaseDir = null;

Unused Use Statements -1 removed lines

@@ -30,7 +30,6 @@
 use Eccube\Application;
 use Eccube\Common\Constant;
 use Eccube\Exception\PluginException;
-use Eccube\Plugin\ConfigManager;
 use Eccube\Plugin\ConfigManager as PluginConfigManager;
 use Eccube\Repository\PluginEventHandlerRepository;
 use Eccube\Repository\PluginRepository;

src/Eccube/Controller/Admin/Order/EditController.php

Spacing +2 added lines, -2 removed lines

@@ -333,7 +333,7 @@ 
                 $session->set('eccube.admin.order.customer.search', $searchData);
                 $session->set('eccube.admin.order.customer.search.page_no', $page_no);
             } else {
-                $searchData = (array)$session->get('eccube.admin.order.customer.search');
+                $searchData = (array) $session->get('eccube.admin.order.customer.search');
                 if (is_null($page_no)) {
                     $page_no = intval($session->get('eccube.admin.order.customer.search.page_no'));
                 } else {
@@ -489,7 +489,7 @@ 
                 $session->set('eccube.admin.order.product.search', $searchData);
                 $session->set('eccube.admin.order.product.search.page_no', $page_no);
             } else {
-                $searchData = (array)$session->get('eccube.admin.order.product.search');
+                $searchData = (array) $session->get('eccube.admin.order.product.search');
                 if (is_null($page_no)) {
                     $page_no = intval($session->get('eccube.admin.order.product.search.page_no'));
                 } else {

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/LimitSubqueryWalker.php

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.");
                     }
                 }

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\AST\Functions\IdentityFunction;
 use Doctrine\ORM\Query\AST\PathExpression;

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

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
             $this->orderByClause
-        )) . ')';
+        )).')';
     }
 
     /**

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

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);
 

Unused Use Statements -9 removed lines

@@ -18,19 +18,10 @@
 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\SelectStatement;
-use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
-use Doctrine\ORM\Query\Expr\OrderBy;
-use Doctrine\ORM\Query\Expr\Select;
 use Doctrine\ORM\Query\SqlWalker;
 
 /**