Add v7 with drop support for PHP < 8.2

.github/workflows/main.yaml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        php: [ '7.2', '7.3', '7.4', '8', '8.1', '8.2', '8.3']
+        php: ['8.2', '8.3']
 
     steps:
       - name: "Init repository"
@@ -26,9 +26,10 @@ jobs:
         run: composer install
 
       - name: "Tests"
-        run: php vendor/bin/phpunit tests --whitelist src --coverage-clover ./build/logs/clover.xml
+        run: composer tests
 
-      - name: "Coveralls"
-        run: php vendor/bin/php-coveralls -v
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: "CS Fix"
+        run: composer cs-fix
+
+      - name: "Phpstan"
+        run: composer phpstan

.gitignore

@@ -12,4 +12,6 @@ cache/
 .phpunit.result.cache
 
 !assets/.gitkeep
-assets/
+assets/
+
+.php-cs-fixer.cache

README.md

@@ -11,6 +11,9 @@
 [![All Contributors](https://img.shields.io/badge/all_contributors-30-orange.svg)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
+> **Warning**
+> 2023-12-31 - Version 7.0.0 will drop support for PHP < 8.2
+
 > **Warning**
 > 2022-11-09 - Instagram changed his DOM AGAIN... Please update to this version 6.16.4
 
@@ -62,6 +65,10 @@ composer require pgrimaud/instagram-user-feed
 
 # Changelog
 
+**v7.0.0** - 2023-12-31:
+
+- Drop support for PHP < 8.2
+
 **v6.16.6** - 2023-12-31:
 
 - Add support for Symfony 7

composer.json

@@ -37,18 +37,21 @@
     }
   },
   "require": {
-    "php": ">=7.2.5",
+    "php": ">=8.2",
     "ext-curl": "*",
     "ext-json": "*",
-    "symfony/cache": "^3.4|^4.3|^5.0|^6.0|^7.0",
-    "guzzlehttp/guzzle": "^6.0|^7.0"
+    "symfony/cache": "^6.0|^7.0",
+    "guzzlehttp/guzzle": "^7.0"
   },
   "require-dev": {
-    "php-coveralls/php-coveralls": "^2.2",
-    "phpunit/phpunit": "^8.5|^9.5",
-    "symfony/var-dumper": "^5.0|^6.0|^7.0"
+    "phpunit/phpunit": "^9.5",
+    "symfony/var-dumper": "^6.0|^7.0",
+    "phpstan/phpstan": "^1.10",
+    "friendsofphp/php-cs-fixer": "^3.45"
   },
   "scripts": {
-    "test": "phpunit tests --whitelist src"
+    "tests": "vendor/bin/phpunit tests --whitelist src --coverage-clover ./build/logs/clover.xml",
+    "phpstan": "vendor/bin/phpstan analyze src examples tests --level max",
+    "cs-fix": "vendor/bin/php-cs-fixer fix src --rules=@PSR12"
   }
 }

src/Instagram/Api.php

@@ -150,7 +150,7 @@ public function login(string $username, string $password, ?ImapClient $imapClien
     {
         $login = new Login($this->client, $username, $password, $imapClient, $this->challengeDelay);
 
-        if ( !($this->cachePool instanceof CacheItemPoolInterface) ) {
+        if (!($this->cachePool instanceof CacheItemPoolInterface)) {
             throw new InstagramAuthException('You must set cachePool / login with cookies, example: \n$cachePool = new \Symfony\Component\Cache\Adapter\FilesystemAdapter("Instagram", 0, __DIR__ . "/../cache"); \n$api = new \Instagram\Api($cachePool);');
         }
 
@@ -775,7 +775,7 @@ public function getTimeline(string $maxId = null): TimelineFeed
 
         return $hydrator->getTimelineFeed();
     }
-      
+
     /**
      * @param string $user
      *

src/Instagram/Auth/Checkpoint/ImapClient.php

@@ -103,7 +103,7 @@ public function getLastInstagramEmailContent(int $try = 1): string
         $resource  = @imap_open('{' . $this->getServer() . '/' . $this->getConnectionType() . '/ssl}INBOX', $this->getLogin(), $this->getPassword());
 
         if (!$resource) {
-          throw new InstagramAuthException('Unable to open IMAP stream.');
+            throw new InstagramAuthException('Unable to open IMAP stream.');
         }
 
         $numberMax = imap_num_msg($resource);

src/Instagram/Auth/Login.php

@@ -115,7 +115,7 @@ public function process(): CookieJar
 
         if (property_exists($response, 'authenticated') && $response->authenticated == true) {
             return $cookieJar;
-        } else if (property_exists($response, 'error_type') && $response->error_type === 'generic_request_error') {
+        } elseif (property_exists($response, 'error_type') && $response->error_type === 'generic_request_error') {
             throw new InstagramAuthException('Generic error / Your IP may be block from Instagram. You should consider using a proxy.');
         } else {
             throw new InstagramAuthException('Wrong login / password');

src/Instagram/Auth/Session.php

@@ -8,7 +8,7 @@
 
 class Session
 {
-    const SESSION_KEY = 'instagram.session';
+    public const SESSION_KEY = 'instagram.session';
 
     /**
      * @var CookieJar

src/Instagram/Hydrator/CarouselHydrator.php

@@ -85,7 +85,7 @@ public function carouselMediaHydrator(array $carouselItems): array
                 'width'                => $carouselItem->original_width,
                 'height'               => $carouselItem->original_height,
             ];
-    
+
             if (property_exists($carouselItem, 'image_versions2')) {
                 $carouselMedia['image'] = $carouselItem->image_versions2->candidates;
             }
@@ -97,11 +97,11 @@ public function carouselMediaHydrator(array $carouselItems): array
             if (property_exists($carouselItem, 'video_duration')) {
                 $carouselMedia['duration'] = $carouselItem->video_duration;
             }
-    
+
             if (property_exists($carouselItem, 'accessibility_caption')) {
                 $carouselMedia['accessibilityCaption'] = $carouselItem->accessibility_caption;
             }
-    
+
             if (property_exists($carouselItem, 'number_of_qualities')) {
                 $carouselMedia['quality'] = $carouselItem->number_of_qualities;
             }
@@ -114,7 +114,7 @@ public function carouselMediaHydrator(array $carouselItems): array
 
     /**
      * @param int $media_type
-     * 
+     *
      * @return string
      * @throws InstagramFetchException
      */

src/Instagram/Hydrator/ImageHydrator.php

@@ -35,7 +35,7 @@ public function imageBaseHydrator(\StdClass $node): Image
         $image->setDate(\DateTime::createFromFormat('U', (string) $node->taken_at));
         $image->setLikes($node->like_count);
         $image->setIsLiked($node->has_liked);
-        
+
         $image->setHeight($node->original_height);
         $image->setWidth($node->original_width);