Merge branch 'release/v3.2.0'

.travis.yml

@@ -4,12 +4,15 @@ php:
     - 7.2
     - 7.3
     - 7.4
-
+    - 8.0
+    - nightly
+jobs:
+    allow_failures:
+        -   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
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM roadiz/php74-nginx-alpine:latest
+FROM roadiz/php80-nginx-alpine:latest
 MAINTAINER Ambroise Maupate <[email protected]>
 ENV USER_UID=1000
 ARG USER_UID=1000

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

Makefile

@@ -1,4 +1,4 @@
 
 test:
 	vendor/bin/phpcbf -p
-	vendor/bin/phpstan analyse -l 2 ./src
+	vendor/bin/phpstan analyse -c phpstan.neon

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": {
@@ -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"
     }
 }

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

phpstan.neon

@@ -0,0 +1,12 @@
+parameters:
+    level: 3
+    paths:
+        - src
+    excludes_analyse:
+        - */node_modules/*
+        - */bower_components/*
+        - */static/*
+    reportUnmatchedIgnoredErrors: false
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    treatPhpDocTypesAsCertain: false

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;

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

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
      *

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
      */

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

src/Env/CacheResolver.php

@@ -1,6 +1,4 @@
 <?php
-
-
 namespace RZ\MixedFeed\Env;
 
 use Doctrine\Common\Cache\ApcuCache;

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

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;

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;

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;

src/GithubReleasesFeed.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace RZ\MixedFeed;
 
 use Doctrine\Common\Cache\CacheProvider;

src/Graph/AccessToken.php

@@ -19,8 +19,6 @@ class AccessToken
     protected $expiresIn = 0;
 
     /**
-     * AccessToken constructor.
-     *
      * @param string $accessToken
      * @param string $tokenType
      * @param int    $expiresIn

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)

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;