Update composer

Signed-off-by: Maxime Gervais <gervais.maxime@gmail.com>

Author: g-maxime

.github/workflows/MediaArea-Website_Checks.yml

@@ -25,7 +25,7 @@ jobs:
           php-version: 7.2
           extensions: gd
           ini-values: memory_limit=-1
-          tools: composer:v1
+          tools: composer:2.2
           coverage: none
       - name: Get composer cache directory
         id: composer-cache
@@ -41,7 +41,7 @@ jobs:
           cp app/config/parameters.yml.ci app/config/parameters.yml
       - name: Install dependencies
         run: |
-          composer require --no-progress --dev friendsofphp/php-cs-fixer:2.13.* phpmd/phpmd:2.7.* --prefer-dist --no-suggest --ansi
+          composer require --no-progress --dev friendsofphp/php-cs-fixer:2.15.* phpmd/phpmd:2.7.* --prefer-dist --no-suggest --ansi
       - name: Configure
         run: |
           php bin/console doctrine:database:create --env=test --if-not-exists
@@ -53,7 +53,7 @@ jobs:
           php bin/console mediaarea:user:donor beta@mediaarea.net 30
       - name: Check
         run: |
-          vendor/bin/php-cs-fixer --dry-run --stop-on-violation --using-cache=no fix src/
+          vendor/bin/php-cs-fixer --verbose --dry-run --using-cache=no fix src/
           vendor/bin/phpmd src/ text phpmd.xml
           php bin/console lint:twig app/ src/
           # php bin/console lint:xliff src/

composer.json

@@ -13,7 +13,6 @@
     },
     "require": {
         "php": ">=5.5.9",
-        "brightnucleus/geolite2-country": "^0.2.3",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-migrations-bundle": "^1.0",
         "doctrine/orm": "^2.5",

composer.lock

@@ -20,11 +20,11 @@ public function testGetTotalPages($items, $itemsPerPage, $expected)
     public function totalPagesProvider()
     {
         return [
-                [100, 10, 10],
-                [101, 10, 11],
-                [109, 10, 11],
-                [5, 10, 1],
-            ];
+            [100, 10, 10],
+            [101, 10, 11],
+            [109, 10, 11],
+            [5, 10, 1],
+        ];
     }
 
     /**
@@ -110,9 +110,9 @@ public function testRouteWithParams($items, $currentPage, $expectedRoute, $expec
 
         $this->assertEquals($expectedRoute, $paginator->getPageRoute($currentPage));
         $this->assertEquals(
-                array_merge($routeParams, $expectedRouteParams),
-                $paginator->getPageRouteParams($currentPage)
-            );
+            array_merge($routeParams, $expectedRouteParams),
+            $paginator->getPageRouteParams($currentPage)
+        );
     }
 
     /**
@@ -128,12 +128,12 @@ public function testIsCurrent($items, $currentPage, $page, $expectedCurrent)
     public function isCurrentProvider()
     {
         return [
-                [95, 1, 1, true],
-                [95, 1, 2, false],
-                [95, 2, 1, false],
-                [95, 2, 2, true],
-                [95, 10, 1, false],
-                [95, 10, 10, true],
-            ];
+            [95, 1, 1, true],
+            [95, 1, 2, false],
+            [95, 2, 1, false],
+            [95, 2, 2, true],
+            [95, 10, 1, false],
+            [95, 10, 10, true],
+        ];
     }
 }

src/AppBundle/Tests/Lib/PaginatorTest.php

@@ -63,10 +63,10 @@ public function feedAction()
     {
         $posts = new Posts($this->getParameter('blog.files.path'));
         $showPosts = new LimitIterator(
-                $posts,
-                0,
-                self::POSTS_PER_PAGE
-            );
+            $posts,
+            0,
+            self::POSTS_PER_PAGE
+        );
 
         // Throw 404 if there is no post
         if (0 == iterator_count($showPosts)) {
@@ -85,10 +85,10 @@ public function listingByTagAction(Request $request, int $page, $tag)
     {
         $posts = new PostsTagFilter(new Posts($this->getParameter('blog.files.path')), $tag);
         $showPosts = new LimitIterator(
-                $posts,
-                ($page - 1) * self::POSTS_PER_PAGE,
-                self::POSTS_PER_PAGE
-            );
+            $posts,
+            ($page - 1) * self::POSTS_PER_PAGE,
+            self::POSTS_PER_PAGE
+        );
 
         // Throw 404 if there is no post
         if (0 == iterator_count($showPosts)) {
@@ -129,10 +129,10 @@ public function listingByTagFeedAction($tag)
     {
         $posts = new PostsTagFilter(new Posts($this->getParameter('blog.files.path')), $tag);
         $showPosts = new LimitIterator(
-                    $posts,
-                    0,
-                    self::POSTS_PER_PAGE
-                );
+            $posts,
+            0,
+            self::POSTS_PER_PAGE
+        );
 
         // Throw 404 if there is no post
         if (0 == iterator_count($showPosts)) {

src/BlogBundle/Controller/DefaultController.php

@@ -25,7 +25,7 @@ public function __construct(
         EntityManagerInterface $em,
         SettingsManager $settings,
         XslPolicyGetPoliciesNamesList $policyList
-        ) {
+    ) {
         $token = $tokenStorage->getToken();
         if (null !== $token && $token->getUser() instanceof UserInterface) {
             $this->user = $token->getUser();
@@ -75,7 +75,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     1 => 1,
                     2 => 2,
                     3 => 3,
-                    4 => 4, '5 (most verbose)' => 5,
+                    4 => 4,
+                    '5 (most verbose)' => 5,
                     ],
                 'placeholder' => false,
                 'required' => false,

src/MediaConchOnlineBundle/Form/Type/CheckerBaseFormType.php

@@ -2,7 +2,6 @@
 
 namespace PaymentBundle\Lib;
 
-use BrightNucleus\GeoLite2Country\Database;
 use GeoIp2\Database\Reader;
 use GeoIp2\Exception\AddressNotFoundException;
 

src/PaymentBundle/Lib/IpToCountry.php

@@ -26,7 +26,7 @@ public function __construct(
         EntityManagerInterface $em,
         SettingsManager $settings,
         XslPolicyGetPoliciesNamesList $policyList
-        ) {
+    ) {
         $token = $tokenStorage->getToken();
         if (null !== $token && $token->getUser() instanceof UserInterface) {
             $this->user = $token->getUser();

src/UserBundle/Form/Type/SettingsFormType.php

@@ -20,7 +20,7 @@ public function __construct(
         RequestStack $requestStack,
         TokenGeneratorInterface $tokenGenerator,
         EncoderFactoryInterface $encoderFactory
-        ) {
+    ) {
         $this->em = $em;
         $this->requestStack = $requestStack;
         $this->tokenGenerator = $tokenGenerator;