Merge pull request #651 from elcodi/feature/some-style-fixes

Fixed composer check-style

.php_cs

@@ -14,5 +14,9 @@ return Symfony\CS\Config\Config::create()
     ->finder(
         Symfony\CS\Finder\DefaultFinder::create()
             ->in('src/')
+            ->in('app/')
+            ->exclude('cache')
+            ->exclude('logs')
+            ->exclude('Resources')
     )
 ;

app/AppCache.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Elcodi package.
  *
- * Copyright (c) 2014 Elcodi.com
+ * Copyright (c) 2014-2015 Elcodi.com
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

app/AppKernel.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Elcodi package.
  *
- * Copyright (c) 2014 Elcodi.com
+ * Copyright (c) 2014-2015 Elcodi.com
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,10 +15,10 @@
  * @author Elcodi Team <tech@elcodi.com>
  */
 
+use Mmoreram\SymfonyBundleDependencies\BundleDependenciesResolver;
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\Bundle\BundleInterface;
-use Mmoreram\SymfonyBundleDependencies\BundleDependenciesResolver;
+use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Class AppKernel
@@ -36,7 +36,7 @@ class AppKernel extends Kernel
      */
     public function registerBundles()
     {
-        $bundles = array(
+        $bundles = [
 
             /**
              * Symfony dependencies
@@ -159,10 +159,9 @@ public function registerBundles()
             new Elcodi\Plugin\FreePaymentBundle\ElcodiFreePaymentBundle(),
             new Elcodi\Plugin\StripeBundle\ElcodiStripeBundle(),
             new Elcodi\Plugin\CustomShippingBundle\ElcodiCustomShippingBundle(),
-        );
-
-        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+        ];
 
+        if (in_array($this->getEnvironment(), ['dev', 'test'])) {
             $bundles[] = new Elcodi\Bundle\FixturesBoosterBundle\ElcodiFixturesBoosterBundle();
             $bundles[] = new Elcodi\Bridge\BehatBridgeBundle\BehatBridgeBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();

app/DoctrineMigrations/Version20151119001829.php

@@ -1,5 +1,20 @@
 <?php
 
+/*
+ * This file is part of the Elcodi package.
+ *
+ * Copyright (c) 2014-2015 Elcodi.com
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <yuhu@mmoreram.com>
+ * @author Aldo Chiecchia <zimage@tiscali.it>
+ * @author Elcodi Team <tech@elcodi.com>
+ */
+
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Migrations\AbstractMigration;

app/autoload.php

@@ -3,7 +3,7 @@
 /*
  * This file is part of the Elcodi package.
  *
- * Copyright (c) 2014 Elcodi.com
+ * Copyright (c) 2014-2015 Elcodi.com
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,8 +21,8 @@
 /**
  * @var ClassLoader $loader
  */
-$loader = require __DIR__.'/../vendor/autoload.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;

app/config/common/services.yml

@@ -35,4 +35,4 @@ services:
         class: Elcodi\Component\Currency\Wrapper\DefaultCurrencyWrapper
         arguments:
             - @elcodi.repository.currency
-            - @elcodi.store_default_currency_iso
+            - @elcodi.store_default_currency_iso

app/config/common/sitemap.yml

@@ -33,4 +33,4 @@ elcodi_sitemap:
         main:
             languages: elcodi.languages_iso_array
             builders:
-                - main
+                - main

app/config/heroku.php

@@ -15,7 +15,6 @@
  * @author Elcodi Team <tech@elcodi.com>
  */
 
-// if the app isn't on Heroku, don't do anything
 if (!($stack = getenv('STACK')) || !($stack == 'cedar' || $stack == 'cedar-14')) {
     return;
 }

app/config/routing/routing_admin.yml

@@ -56,4 +56,4 @@ admin_login_check:
     path:  /login_check
 
 admin_logout:
-    path: /logout
+    path: /logout

composer.json

@@ -111,8 +111,11 @@
     },
     "scripts": {
         "check-style": [
-            "php-cs-fixer fix --config-file=.php_cs",
-            "php-formatter f:u:s src"
+            "bin/php-cs-fixer fix --config-file=.php_cs",
+            "bin/php-formatter f:u:s src",
+            "bin/php-formatter f:u:s app",
+            "bin/php-formatter f:h:f src",
+            "bin/php-formatter f:h:f app"
         ],
         "compile": [
             "app/console -n doctrine:migrations:status",