Psr18 (#796)

* add psr-18 http client * upd README.md * upd phpunit * guzzlehttp/psr7
postaddictme · Oct 22, 2020 · b265382 · b265382
1 parent cd9e475
commit b265382
Show file tree

Hide file tree

Showing 34 changed files with 193 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -2,21 +2,22 @@
 This library is based on the Instagram web version. We develop it because nowadays it is hard to get an approved Instagram application. The purpose is to support every feature that the web desktop and mobile version support. 
 
 ## Dependencies
-
+- PHP >= 7.2
 - [PSR-16](http://www.php-fig.org/psr/psr-16/)
+- [PSR-18](http://www.php-fig.org/psr/psr-18/)
 
 
 ## Code Example
 ```php
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password');
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password');
 $instagram->login();
 $account = $instagram->getAccountById(3);
 echo $account->getUsername();
 ```
 
 Some methods do not require authentication: 
 ```php
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 $nonPrivateAccountMedias = $instagram->getMedias('kevin');
 echo $nonPrivateAccountMedias[0]->getLink();
 ```
@@ -26,7 +27,7 @@ If you use authentication it is recommended to cache the user session. In this c
 ```php
 use Phpfastcache\Helper\Psr16Adapter;
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login(); // will use cached session if you want to force login $instagram->login(true)
 $instagram->saveSession();  //DO NOT forget this in order to save the session, otherwise have no sense
 $account = $instagram->getAccountById(3);
@@ -36,16 +37,11 @@ echo $account->getUsername();
 Using proxy for requests:
 
 ```php
-$instagram = new \InstagramScraper\Instagram();
-Instagram::setProxy([
-    'address' => '111.112.113.114',
-    'port'    => '8080',
-    'tunnel'  => true,
-    'timeout' => 30,
-]);
+// https://docs.guzzlephp.org/en/stable/request-options.html#proxy
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client(['proxy' => 'tcp://localhost:8125']));
 // Request with proxy
 $account = $instagram->getAccount('kevin');
-Instagram::disableProxy();
+\InstagramScraper\Instagram::setHttpClient(new \GuzzleHttp\Client());
 // Request without proxy
 $account = $instagram->getAccount('kevin');
 ```

diff --git a/composer.json b/composer.json
@@ -15,15 +15,17 @@
     }
   ],
   "require": {
-    "php": ">=5.4.0",
-    "mashape/unirest-php": "3.0.*",
+    "php": ">=7.2",
     "ext-curl": "*",
     "ext-json": "*",
-    "psr/simple-cache": "~1.0"
+    "psr/simple-cache": "~1.0",
+    "psr/http-client": "~1.0",
+    "guzzlehttp/psr7": "^1.7"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.5.*",
-    "phpfastcache/phpfastcache": "^7.1"
+    "phpunit/phpunit": "^7.0",
+    "phpfastcache/phpfastcache": "^7.1",
+    "guzzlehttp/guzzle": "^7.2"
   },
   "autoload": {
     "psr-4": {

diff --git a/examples/addAndDeleteComment.php b/examples/addAndDeleteComment.php
@@ -4,7 +4,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 try {

diff --git a/examples/getAccountById.php b/examples/getAccountById.php
@@ -1,7 +1,7 @@
 <?php
 require __DIR__ . '/../vendor/autoload.php';
 
-$account = (new \InstagramScraper\Instagram())->getAccountById('3');
+$account = (new \InstagramScraper\Instagram(new \GuzzleHttp\Client()))->getAccountById('3');
 
 // Available fields
 echo "Account info:\n";

diff --git a/examples/getAccountByUsername.php b/examples/getAccountByUsername.php
@@ -3,7 +3,7 @@
 
 // If account is public you can query Instagram without auth
 
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 
 // For getting information about account you don't need to auth:
 

diff --git a/examples/getAccountFollowers.php b/examples/getAccountFollowers.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 sleep(2); // Delay to mimic user
 

diff --git a/examples/getAccountFollowings.php b/examples/getAccountFollowings.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 sleep(2); // Delay to mimic user
 

diff --git a/examples/getAccountMediasByUsername.php b/examples/getAccountMediasByUsername.php
@@ -5,7 +5,7 @@
 
 // If account is public you can query Instagram without auth
 
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 $medias = $instagram->getMedias('kevin', 25);
 
 // Let's look at $media
@@ -30,6 +30,6 @@
 
 
 // If account private you should be subscribed and after auth it will be available
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 $medias = $instagram->getMedias('private_account', 100);
diff --git a/examples/getCurrentTopMediasByLocationId.php b/examples/getCurrentTopMediasByLocationId.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $medias = $instagram->getCurrentTopMediasByLocationId('1');

diff --git a/examples/getCurrentTopMediasByTagName.php b/examples/getCurrentTopMediasByTagName.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $medias = $instagram->getCurrentTopMediasByTagName('youneverknow');

diff --git a/examples/getFeed.php b/examples/getFeed.php
@@ -4,7 +4,7 @@
 use InstagramScraper\Instagram;
 use Phpfastcache\Helper\Psr16Adapter;
 
-$instagram  = Instagram::withCredentials('login', 'password', new Psr16Adapter('Files'));
+$instagram  = Instagram::withCredentials(new \GuzzleHttp\Client(), 'login', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 $instagram->saveSession();
 

diff --git a/examples/getHighlights.php b/examples/getHighlights.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $userId = $instagram->getAccount('instagram')->getId();

diff --git a/examples/getLocationById.php b/examples/getLocationById.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 // Location id from facebook

diff --git a/examples/getMediaByCode.php b/examples/getMediaByCode.php
@@ -5,10 +5,10 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 // If account is public you can query Instagram without auth
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 
 // If account is private and you subscribed to it, first login
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $media = $instagram->getMediaByCode('BHaRdodBouH');

diff --git a/examples/getMediaById.php b/examples/getMediaById.php
@@ -4,10 +4,10 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 // If account is public you can query Instagram without auth
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 
 // If account is private and you subscribed to it, first login
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $media = $instagram->getMediaById('1270593720437182847');

diff --git a/examples/getMediaByUrl.php b/examples/getMediaByUrl.php
@@ -4,10 +4,10 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 // If account is public you can query Instagram without auth
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 
 // If account is private and you subscribed to it, first login
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $media = $instagram->getMediaByUrl('https://www.instagram.com/p/BHaRdodBouH');

diff --git a/examples/getMediaComments.php b/examples/getMediaComments.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 // Get media comments by shortcode

diff --git a/examples/getMediasByLocationId.php b/examples/getMediasByLocationId.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $medias = $instagram->getMediasByLocationId('1', 20);

diff --git a/examples/getMediasByTag.php b/examples/getMediasByTag.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $medias = $instagram->getMediasByTag('youneverknow', 20);

diff --git a/examples/getPaginateMediasByTag.php b/examples/getPaginateMediasByTag.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $result = $instagram->getPaginateMediasByTag('zara');

diff --git a/examples/getPaginateMediasByUsername.php b/examples/getPaginateMediasByUsername.php
@@ -1,7 +1,7 @@
 <?php
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 $response = $instagram->getPaginateMedias('kevin');
 
 foreach ($response['medias'] as $media) {

diff --git a/examples/getSidecarMediaByUrl.php b/examples/getSidecarMediaByUrl.php
@@ -16,10 +16,10 @@ function printMediaInfo(\InstagramScraper\Model\Media $media, $padding = '') {
 }
 
 // If account is public you can query Instagram without auth
-$instagram = new \InstagramScraper\Instagram();
+$instagram = new \InstagramScraper\Instagram(new \GuzzleHttp\Client());
 
 // If account is private and you subscribed to it firstly login
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $media = $instagram->getMediaByUrl('https://www.instagram.com/p/BQ0lhTeAYo5');

diff --git a/examples/getStories.php b/examples/getStories.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $stories = $instagram->getStories();

diff --git a/examples/getThreads.php b/examples/getThreads.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 $instagram->saveSession();
 

diff --git a/examples/likeAndUnlikeMedia.php b/examples/likeAndUnlikeMedia.php
@@ -4,7 +4,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 try {

diff --git a/examples/paginateAccountMediaByUsername.php b/examples/paginateAccountMediaByUsername.php
@@ -3,7 +3,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 // getPaginateMedias() works with and without authentication
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 $result = $instagram->getPaginateMedias('kevin');

diff --git a/examples/searchAccountsByUsername.php b/examples/searchAccountsByUsername.php
@@ -3,7 +3,7 @@
 
 require __DIR__ . '/../vendor/autoload.php';
 
-$instagram = \InstagramScraper\Instagram::withCredentials('username', 'password', new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'username', 'password', new Psr16Adapter('Files'));
 $instagram->login();
 
 

diff --git a/examples/setCustomCookies.php b/examples/setCustomCookies.php
@@ -15,7 +15,7 @@
     "ds_user_id"    =>	"36*****872",
 ];
 
-$instagram = \InstagramScraper\Instagram::withCredentials($this->instaUsername, $this->instaPassword, new Psr16Adapter('Files'));
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), $this->instaUsername, $this->instaPassword, new Psr16Adapter('Files'));
 $instagram->setUserAgent('User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Firefox/78.0');
 $instagram->setCustomCookies($newCookie);
 $instagram->login();

diff --git a/examples/twoStepAutoVerification/loginWithEmailAutoCponfirm.php b/examples/twoStepAutoVerification/loginWithEmailAutoCponfirm.php
@@ -6,7 +6,7 @@
  * EmailVerification requires https://packagist.org/packages/php-mail-client/client
  */
 
-$instagram = \InstagramScraper\Instagram::withCredentials('user', 'password');
+$instagram = \InstagramScraper\Instagram::withCredentials(new \GuzzleHttp\Client(), 'user', 'password', new \Phpfastcache\Helper\Psr16Adapter('Files'));
 
 $emailVecification = new EmailVerification(
     '[email protected]',

diff --git a/src/InstagramScraper/Endpoints.php b/src/InstagramScraper/Endpoints.php
@@ -6,7 +6,7 @@ class Endpoints
 {
     const BASE_URL = 'https://www.instagram.com';
     const LOGIN_URL = 'https://www.instagram.com/accounts/login/ajax/';
-    const ACCOUNT_PAGE = 'https://www.instagram.com/{username}';
+    const ACCOUNT_PAGE = 'https://www.instagram.com/{username}/';
     const MEDIA_LINK = 'https://www.instagram.com/p/{code}';
     const ACCOUNT_MEDIAS = 'https://www.instagram.com/graphql/query/?query_hash=e769aa130647d2354c40ea6a439bfc08&variables={variables}';
     const ACCOUNT_JSON_INFO = 'https://www.instagram.com/{username}/?__a=1';