From 91165ca39ad69be808a7abbd149de617a80475c5 Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise@rezo-zero.com>
Date: Thu, 24 Dec 2020 17:34:22 +0100
Subject: [PATCH 1/4] Test on php8 and nightly, removed dead phpdoc

---
 .travis.yml                                   |  9 +++--
 LICENSE                                       |  2 +-
 Makefile                                      |  2 +-
 composer.json                                 |  4 +-
 phpstan.neon                                  |  9 +++++
 src/AbstractFeedProvider.php                  | 24 ------------
 .../AbstractTwitterFeed.php                   | 28 +-------------
 .../AbstractYoutubeVideoFeed.php              |  5 ++-
 src/Canonical/FeedItem.php                    |  8 ----
 src/Canonical/Image.php                       |  7 ----
 src/Env/CacheResolver.php                     |  2 -
 src/Exception/CredentialsException.php        | 26 +------------
 src/Exception/FeedProviderErrorException.php  | 24 ------------
 src/FacebookPageFeed.php                      | 24 ------------
 src/GithubCommitsFeed.php                     | 24 ------------
 src/GithubReleasesFeed.php                    |  1 -
 src/Graph/AccessToken.php                     |  2 -
 src/Graph/RefreshInstagramAccessToken.php     |  2 -
 src/GraphInstagramFeed.php                    | 24 ------------
 src/InstagramFeed.php                         | 26 +------------
 src/InstagramOEmbedFeed.php                   |  1 -
 src/MediumFeed.php                            |  5 +--
 src/MixedFeed.php                             | 24 ------------
 src/MockObject/ErroredFeedItem.php            | 37 +++++++------------
 src/PinterestBoardFeed.php                    | 25 +------------
 src/Response/FeedItemResponse.php             |  3 --
 src/TwitterFeed.php                           | 24 ------------
 src/TwitterSearchFeed.php                     | 25 -------------
 src/YoutubeMostPopularFeed.php                |  1 -
 src/YoutubePlaylistItemFeed.php               |  2 -
 30 files changed, 40 insertions(+), 360 deletions(-)
 create mode 100644 phpstan.neon

diff --git a/.travis.yml b/.travis.yml
index 70c13d3..0b6d2ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,15 @@ php:
     - 7.2
     - 7.3
     - 7.4
-
+    - 8.0
+    - nightly
+allow_failures:
+    -   php: 8.0
+    -   php: nightly
 install:
     - curl -s http://getcomposer.org/installer | php
     - php composer.phar install --dev --no-interaction
-
 script:
     - vendor/bin/phpcs -p
-    - vendor/bin/phpstan analyse -l 2 ./src
+    - vendor/bin/phpstan analyse -c phpstan.neon -l 3 ./src
 
diff --git a/LICENSE b/LICENSE
index 16d585d..6ffcb8f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 REZO ZERO
+Copyright (c) 2021 REZO ZERO
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
index cc451e0..97675cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 
 test:
 	vendor/bin/phpcbf -p
-	vendor/bin/phpstan analyse -l 2 ./src
+	vendor/bin/phpstan analyse -c phpstan.neon -l 3 ./src
diff --git a/composer.json b/composer.json
index 290b9b4..523d3b5 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,9 @@
     ],
     "require": {
         "php": ">=7.2",
-        "abraham/twitteroauth": "^0.7.4",
+        "abraham/twitteroauth": "^2.0.0",
         "doctrine/cache": "^1.6.2",
-        "guzzlehttp/guzzle": "~6.0",
+        "guzzlehttp/guzzle": "~6.0 || ~7.0",
         "ext-json": "*"
     },
     "autoload": {
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..ad3d8b9
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,9 @@
+parameters:
+    excludes_analyse:
+        - */node_modules/*
+        - */bower_components/*
+        - */static/*
+    reportUnmatchedIgnoredErrors: false
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    treatPhpDocTypesAsCertain: false
diff --git a/src/AbstractFeedProvider.php b/src/AbstractFeedProvider.php
index d6e9474..d82ec4c 100644
--- a/src/AbstractFeedProvider.php
+++ b/src/AbstractFeedProvider.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file AbstractFeedProvider.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
diff --git a/src/AbstractFeedProvider/AbstractTwitterFeed.php b/src/AbstractFeedProvider/AbstractTwitterFeed.php
index fde476c..f46fa99 100644
--- a/src/AbstractFeedProvider/AbstractTwitterFeed.php
+++ b/src/AbstractFeedProvider/AbstractTwitterFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file AbstractTwitterFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed\AbstractFeedProvider;
 
 use Abraham\TwitterOAuth\TwitterOAuth;
@@ -39,8 +15,7 @@
 abstract class AbstractTwitterFeed extends BaseFeedProvider
 {
     /**
-     * Shorter TTL for Twitter
-     * 5 min
+     * Shorter TTL for Twitter - 5 min
      * @var int
      */
     protected $ttl = 60*5;
@@ -58,7 +33,6 @@ abstract class AbstractTwitterFeed extends BaseFeedProvider
     protected static $timeKey = 'created_at';
 
     /**
-     *
      * @param string $consumerKey
      * @param string $consumerSecret
      * @param string $accessToken
diff --git a/src/AbstractFeedProvider/AbstractYoutubeVideoFeed.php b/src/AbstractFeedProvider/AbstractYoutubeVideoFeed.php
index 734d562..1d6f64b 100644
--- a/src/AbstractFeedProvider/AbstractYoutubeVideoFeed.php
+++ b/src/AbstractFeedProvider/AbstractYoutubeVideoFeed.php
@@ -11,11 +11,12 @@
 
 abstract class AbstractYoutubeVideoFeed extends AbstractFeedProvider
 {
+    /**
+     * @var string
+     */
     protected $apiKey;
 
     /**
-     * YoutubeVideoFeed constructor.
-     *
      * @param string             $apiKey
      * @param CacheProvider|null $cacheProvider
      *
diff --git a/src/Canonical/FeedItem.php b/src/Canonical/FeedItem.php
index d7a2605..e863d1d 100644
--- a/src/Canonical/FeedItem.php
+++ b/src/Canonical/FeedItem.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * mixedfeed - FeedItem.php
- *
- * Initial version by: ambroisemaupate
- * Initial version created on: 2019-02-12
- */
-
 namespace RZ\MixedFeed\Canonical;
 
 class FeedItem
@@ -46,7 +39,6 @@ class FeedItem
      * @var array
      */
     protected $tags = [];
-
     /**
      * @var int|null
      */
diff --git a/src/Canonical/Image.php b/src/Canonical/Image.php
index 1fc22d9..21d546d 100644
--- a/src/Canonical/Image.php
+++ b/src/Canonical/Image.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * mixedfeed - Image.php
- *
- * Initial version by: ambroisemaupate
- * Initial version created on: 2019-02-12
- */
-
 namespace RZ\MixedFeed\Canonical;
 
 class Image
diff --git a/src/Env/CacheResolver.php b/src/Env/CacheResolver.php
index 1780623..8b98ea9 100644
--- a/src/Env/CacheResolver.php
+++ b/src/Env/CacheResolver.php
@@ -1,6 +1,4 @@
 <?php
-
-
 namespace RZ\MixedFeed\Env;
 
 use Doctrine\Common\Cache\ApcuCache;
diff --git a/src/Exception/CredentialsException.php b/src/Exception/CredentialsException.php
index 1474a31..d2902e4 100644
--- a/src/Exception/CredentialsException.php
+++ b/src/Exception/CredentialsException.php
@@ -1,35 +1,11 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file CredentialsException.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed\Exception;
 
 use Throwable;
 
 class CredentialsException extends \Exception
 {
-    public function __construct($message = "Unsufficient authentification data found.", $code = 0, Throwable $previous = null)
+    public function __construct($message = "Insufficient authentication data found.", $code = 0, Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }
diff --git a/src/Exception/FeedProviderErrorException.php b/src/Exception/FeedProviderErrorException.php
index 79f7e7e..14c98a0 100644
--- a/src/Exception/FeedProviderErrorException.php
+++ b/src/Exception/FeedProviderErrorException.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file FeedProviderErrorException.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed\Exception;
 
 use Throwable;
diff --git a/src/FacebookPageFeed.php b/src/FacebookPageFeed.php
index d45a780..7d1aece 100644
--- a/src/FacebookPageFeed.php
+++ b/src/FacebookPageFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file FacebookPageFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
diff --git a/src/GithubCommitsFeed.php b/src/GithubCommitsFeed.php
index a0639f7..dc98330 100644
--- a/src/GithubCommitsFeed.php
+++ b/src/GithubCommitsFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file GithubCommitsFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
diff --git a/src/GithubReleasesFeed.php b/src/GithubReleasesFeed.php
index e030024..4e17664 100644
--- a/src/GithubReleasesFeed.php
+++ b/src/GithubReleasesFeed.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
diff --git a/src/Graph/AccessToken.php b/src/Graph/AccessToken.php
index 739722d..9746191 100644
--- a/src/Graph/AccessToken.php
+++ b/src/Graph/AccessToken.php
@@ -19,8 +19,6 @@ class AccessToken
     protected $expiresIn = 0;
 
     /**
-     * AccessToken constructor.
-     *
      * @param string $accessToken
      * @param string $tokenType
      * @param int    $expiresIn
diff --git a/src/Graph/RefreshInstagramAccessToken.php b/src/Graph/RefreshInstagramAccessToken.php
index a5e1ce0..43a19c3 100644
--- a/src/Graph/RefreshInstagramAccessToken.php
+++ b/src/Graph/RefreshInstagramAccessToken.php
@@ -21,8 +21,6 @@ final class RefreshInstagramAccessToken
     private static $grantType = 'ig_refresh_token';
 
     /**
-     * RefreshInstagramAccessToken constructor.
-     *
      * @param string $accessToken
      */
     public function __construct(string $accessToken)
diff --git a/src/GraphInstagramFeed.php b/src/GraphInstagramFeed.php
index d79414a..e05223d 100644
--- a/src/GraphInstagramFeed.php
+++ b/src/GraphInstagramFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2020, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file InstagramFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
diff --git a/src/InstagramFeed.php b/src/InstagramFeed.php
index 27795d4..f6ed374 100644
--- a/src/InstagramFeed.php
+++ b/src/InstagramFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file InstagramFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
@@ -34,7 +10,7 @@
 
 /**
  * Get an Instagram user feed.
- * @deprecated Use GraphInstragramFeed to comply with new Facebook API policy
+ * @deprecated Use GraphInstagramFeed to comply with new Facebook API policy
  */
 class InstagramFeed extends AbstractFeedProvider
 {
diff --git a/src/InstagramOEmbedFeed.php b/src/InstagramOEmbedFeed.php
index 8509eed..95b1a47 100644
--- a/src/InstagramOEmbedFeed.php
+++ b/src/InstagramOEmbedFeed.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
diff --git a/src/MediumFeed.php b/src/MediumFeed.php
index e3b4fc7..e01cd2b 100644
--- a/src/MediumFeed.php
+++ b/src/MediumFeed.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
@@ -34,10 +33,8 @@ class MediumFeed extends AbstractFeedProvider
     private $useLatestPublicationDate = false;
 
     /**
-     * MediumFeed constructor.
-     *
      * @param string        $username
-     * @param CacheProvider $cacheProvider
+     * @param CacheProvider|null $cacheProvider
      * @param null          $userId
      */
     public function __construct($username, CacheProvider $cacheProvider = null, $userId = null)
diff --git a/src/MixedFeed.php b/src/MixedFeed.php
index 982354e..226f093 100644
--- a/src/MixedFeed.php
+++ b/src/MixedFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2018, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file MixedFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use GuzzleHttp\Client;
diff --git a/src/MockObject/ErroredFeedItem.php b/src/MockObject/ErroredFeedItem.php
index 827114d..0c65499 100644
--- a/src/MockObject/ErroredFeedItem.php
+++ b/src/MockObject/ErroredFeedItem.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file ErroredFeedItem.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed\MockObject;
 
 /**
@@ -31,10 +7,23 @@
  */
 class ErroredFeedItem extends \stdClass
 {
+    /**
+     * @var \Datetime
+     */
     public $normalizedDate;
+    /**
+     * @var string
+     */
     public $message;
+    /**
+     * @var string
+     */
     public $feedItemPlatform;
 
+    /**
+     * @param string $message
+     * @param string $feedItemPlatform
+     */
     public function __construct($message, $feedItemPlatform)
     {
         $this->message = $message;
diff --git a/src/PinterestBoardFeed.php b/src/PinterestBoardFeed.php
index 08622ef..2ed8c8e 100644
--- a/src/PinterestBoardFeed.php
+++ b/src/PinterestBoardFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file PinterestBoardFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;
@@ -101,6 +77,7 @@ public function isValid($feed)
     /**
      * @param int $count
      * @return mixed
+     * @throws FeedProviderErrorException
      */
     protected function getFeed($count = 5)
     {
diff --git a/src/Response/FeedItemResponse.php b/src/Response/FeedItemResponse.php
index 2bc1f5b..d831556 100644
--- a/src/Response/FeedItemResponse.php
+++ b/src/Response/FeedItemResponse.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace RZ\MixedFeed\Response;
 
 class FeedItemResponse
@@ -15,8 +14,6 @@ class FeedItemResponse
     protected $meta;
 
     /**
-     * FeedItemResponse constructor.
-     *
      * @param array $feedItems
      * @param array $meta
      */
diff --git a/src/TwitterFeed.php b/src/TwitterFeed.php
index d71940e..d299b83 100644
--- a/src/TwitterFeed.php
+++ b/src/TwitterFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file TwitterFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Abraham\TwitterOAuth\TwitterOAuthException;
diff --git a/src/TwitterSearchFeed.php b/src/TwitterSearchFeed.php
index 2cbcbaf..fabe06b 100644
--- a/src/TwitterSearchFeed.php
+++ b/src/TwitterSearchFeed.php
@@ -1,28 +1,4 @@
 <?php
-/**
- * Copyright © 2015, Ambroise Maupate
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished
- * to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * @file TwitterSearchFeed.php
- * @author Ambroise Maupate
- */
 namespace RZ\MixedFeed;
 
 use Abraham\TwitterOAuth\TwitterOAuthException;
@@ -58,7 +34,6 @@ class TwitterSearchFeed extends AbstractTwitterFeed
     protected static $timeKey = 'created_at';
 
     /**
-     *
      * @param array              $queryParams
      * @param string             $consumerKey
      * @param string             $consumerSecret
diff --git a/src/YoutubeMostPopularFeed.php b/src/YoutubeMostPopularFeed.php
index d833337..68ae182 100644
--- a/src/YoutubeMostPopularFeed.php
+++ b/src/YoutubeMostPopularFeed.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace RZ\MixedFeed;
 
 use GuzzleHttp\Psr7\Request;
diff --git a/src/YoutubePlaylistItemFeed.php b/src/YoutubePlaylistItemFeed.php
index 0b87947..843f76c 100644
--- a/src/YoutubePlaylistItemFeed.php
+++ b/src/YoutubePlaylistItemFeed.php
@@ -16,8 +16,6 @@ class YoutubePlaylistItemFeed extends AbstractYoutubeVideoFeed
     protected $playlistId;
 
     /**
-     * YoutubePlaylistItemFeed constructor.
-     *
      * @param string             $playlistId
      * @param string             $apiKey
      * @param CacheProvider|null $cacheProvider

From 8e33baf5a3c4902d6b2cd969dd795337c161cf28 Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise@rezo-zero.com>
Date: Fri, 25 Dec 2020 19:42:32 +0100
Subject: [PATCH 2/4] Fixed travis syntax

---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b6d2ed..6e11a08 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,10 @@ php:
     - 7.4
     - 8.0
     - nightly
-allow_failures:
-    -   php: 8.0
-    -   php: nightly
+jobs:
+    allow_failures:
+        -   php: 8.0
+        -   php: nightly
 install:
     - curl -s http://getcomposer.org/installer | php
     - php composer.phar install --dev --no-interaction

From 810c1de176296b3e33743ee01c8d4fa84cbd94e3 Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise@rezo-zero.com>
Date: Thu, 27 May 2021 18:50:48 +0200
Subject: [PATCH 3/4] Must not fail php8

---
 .travis.yml   | 3 +--
 Makefile      | 2 +-
 composer.json | 4 ++--
 phpstan.neon  | 3 +++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6e11a08..5765ee3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,12 +8,11 @@ php:
     - nightly
 jobs:
     allow_failures:
-        -   php: 8.0
         -   php: nightly
 install:
     - curl -s http://getcomposer.org/installer | php
     - php composer.phar install --dev --no-interaction
 script:
     - vendor/bin/phpcs -p
-    - vendor/bin/phpstan analyse -c phpstan.neon -l 3 ./src
+    - vendor/bin/phpstan analyse -c phpstan.neon
 
diff --git a/Makefile b/Makefile
index 97675cc..6da908d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
 
 test:
 	vendor/bin/phpcbf -p
-	vendor/bin/phpstan analyse -c phpstan.neon -l 3 ./src
+	vendor/bin/phpstan analyse -c phpstan.neon
diff --git a/composer.json b/composer.json
index 523d3b5..862f634 100644
--- a/composer.json
+++ b/composer.json
@@ -31,8 +31,8 @@
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.3",
         "jms/serializer": "^2.1 || ^3.5",
-        "symfony/stopwatch": "^4.2",
-        "symfony/dotenv": "^4.2",
+        "symfony/stopwatch": ">=4.2",
+        "symfony/dotenv": ">=4.2",
         "phpstan/phpstan": "^0.12.14"
     }
 }
diff --git a/phpstan.neon b/phpstan.neon
index ad3d8b9..12f3e15 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,4 +1,7 @@
 parameters:
+    level: 3
+    paths:
+        - src
     excludes_analyse:
         - */node_modules/*
         - */bower_components/*

From 082ce734991bb484015f5020b8ec5896f2316ac1 Mon Sep 17 00:00:00 2001
From: Ambroise Maupate <ambroise@rezo-zero.com>
Date: Thu, 27 May 2021 18:54:49 +0200
Subject: [PATCH 4/4] Use php8 for docker

---
 Dockerfile         |  2 +-
 docker-compose.yml | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3914faf..9aad904 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM roadiz/php74-nginx-alpine:latest
+FROM roadiz/php80-nginx-alpine:latest
 MAINTAINER Ambroise Maupate <ambroise@rezo-zero.com>
 ENV USER_UID=1000
 ARG USER_UID=1000
diff --git a/docker-compose.yml b/docker-compose.yml
index 107f8ef..9e60327 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,10 +35,13 @@ services:
       - 8080:80/tcp
     labels:
       - "traefik.enable=true"
-      - "traefik.port=80"
-      - "traefik.frontend.rule=Host:mixedfeed.test"
-      - "traefik.frontend.passHostHeader=true"
-      - "traefik.backend=example"
+      - "traefik.http.services.mixedfeed.loadbalancer.server.scheme=http"
+      - "traefik.http.services.mixedfeed.loadbalancer.server.port=80"
+      - "traefik.http.services.mixedfeed.loadbalancer.passhostheader=true"
+      # Listen HTTP
+      - "traefik.http.routers.mixedfeed.entrypoints=http"
+      - "traefik.http.routers.mixedfeed.rule=Host(`mixedfeed.test`)"
+      - "traefik.http.routers.mixedfeed.service=mixedfeed"
     networks:
       - default
       - frontproxynet