Merge pull request #17 from venca-x/master

Stable abraham/twitteroauth

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-    - 7.1
     - 7.2
     - 7.3
     - 7.4
@@ -13,7 +12,7 @@ install:
     - travis_retry composer install --no-progress --prefer-dist
 
 script:
-    - vendor/bin/tester tests -s
+    - vendor/bin/tester -c tests/php.ini -s tests
 
 after_failure:
     # Print *.actual content
@@ -36,7 +35,7 @@ jobs:
 
             script:
                 - php temp/code-checker/code-checker -d src -d tests --short-arrays --strict-types
-                - php temp/coding-standard/ecs check src tests --config temp/coding-standard/coding-standard-php71.yml
+                - php temp/coding-standard/ecs check src tests --preset php71
 
 
         -   stage: Code Coverage

Gruntfile.js

@@ -18,7 +18,7 @@ module.exports = function (grunt) {
                 command: 'composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable'
             },
             test: {
-                command: 'vendor\\bin\\tester tests -s -p php'
+                command: 'vendor\\bin\\tester -c tests/php.ini -s tests'
             },
             installCodeSoft: {
                 command: 'composer create-project nette/coding-standard nette-coding-standard',
@@ -31,10 +31,10 @@ module.exports = function (grunt) {
                 command: 'php ..\\..\\nette-code-checker\\code-checker -d src -d tests --short-arrays --strict-types --fix'
             },
             netteCodingStandard: {
-                command: 'php ..\\..\\nette-coding-standard\\ecs check src tests --config ..\\..\\nette-coding-standard\\coding-standard-php71.yml'
+                command: 'php ..\\..\\nette-coding-standard\\ecs check src tests --preset php71'
             },
             netteCodingStandardFIX: {
-                command: 'php ..\\..\\nette-coding-standard\\ecs check src tests --config ..\\..\\nette-coding-standard\\coding-standard-php71.yml --fix'
+                command: 'php ..\\..\\nette-coding-standard\\ecs check src tests --preset php71 --fix'
             }
         }
     });

README.md

@@ -1,7 +1,7 @@
 social-login
 ===============
 
-[![Build Status](https://travis-ci.org/venca-x/social-login.svg)](https://travis-ci.org/venca-x/social-login)
+[![Build Status](https://travis-ci.com/venca-x/social-login.svg)](https://travis-ci.com/venca-x/social-login)
 [![Coverage Status](https://coveralls.io/repos/github/venca-x/social-login/badge.svg?branch=master)](https://coveralls.io/github/venca-x/social-login?branch=master) 
 [![Latest Stable Version](https://poser.pugx.org/venca-x/social-login/v/stable.svg)](https://packagist.org/packages/venca-x/social-login) 
 [![Latest Unstable Version](https://poser.pugx.org/venca-x/social-login/v/unstable.svg)](https://packagist.org/packages/venca-x/social-login) 
@@ -12,7 +12,7 @@ Nette addon for login with social networks
 
 | Version     | Facebook App API | PHP     | Recommended Nette             |
 | ---         | ---              | ---     | ---                           |
-| dev-master  | 8.0 or own       | \>= 7.1 | Nette 3.0                     |
+| dev-master  | 8.0 or own       | \>= 7.2 | Nette 3.0                     |
 | 1.2.x       | 8.0 or own       | \>= 7.1 | Nette 3.0                     |
 | 1.1.x       | 2.6              | \>= 7.0 | Nette 2.4 (Nette\SmartObject) |
 | 1.0.x       | 2.6              | \>= 5.5 | Nette 2.4, 2.3 (Nette\Object) |

composer.json

@@ -18,11 +18,11 @@
     }
   ],
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.2",
     "nette/application": "^3.0",
     "facebook/graph-sdk": "^5.6",
     "google/apiclient": "^2.8",
-    "kertz/twitteroauth": "dev-master"
+    "abraham/twitteroauth": "^2.0.0"
   },
   "require-dev": {
     "nette/robot-loader": "^3.0",

src/BaseLogin.php

@@ -13,7 +13,7 @@ class BaseLogin
 	/** @var array params */
 	protected $params;
 
-	/** @var String cookie name - save last used service for login */
+	/** @var string cookie name - save last used service for login */
 	protected $cookieName;
 
 	/** @var Nette\Http\IResponse */

src/FacebookLogin.php

@@ -140,22 +140,20 @@ class FacebookLogin extends BaseLogin
 	private $callBackUrl = '';
 
 
-	/**
-	 * @param $params array - data from config.neon
-	 * @param $cookieName String cookie name
-	 * @param Nette\Http\IResponse $httpResponse
-	 * @param Nette\Http\IRequest $httpRequest
-	 */
-	public function __construct($params, $cookieName, Nette\Http\IResponse $httpResponse, Nette\Http\IRequest $httpRequest)
-	{
+	public function __construct(
+		$params,
+		$cookieName,
+		Nette\Http\IResponse $httpResponse,
+		Nette\Http\IRequest $httpRequest
+	) {
 		$this->params = $params;
 		$this->cookieName = $cookieName;
 		$this->httpResponse = $httpResponse;
 		$this->httpRequest = $httpRequest;
 		$this->callBackUrl = $this->params['callbackURL'];
 
 		$default_graph_version = self::DEFAULT_FB_GRAPH_VERSION;
-		if (array_key_exists ('defaultFbGraphVersion', $this->params) && $this->params['defaultFbGraphVersion'] != '') {
+		if (array_key_exists('defaultFbGraphVersion', $this->params) && $this->params['defaultFbGraphVersion'] != '') {
 			//set users defaultFbGraphVersion
 			$default_graph_version = $this->params['defaultFbGraphVersion'];
 		}
@@ -216,7 +214,7 @@ public function getMe($fields)
 
 		if ($fields == '' || !is_array($fields) || count($fields) == 0) {
 			//array is empty
-			$fields = [self::ID];//set ID field
+			$fields = [self::ID]; //set ID field
 		}
 
 		try {

src/GoogleLogin.php

@@ -25,14 +25,18 @@ class GoogleLogin extends BaseLogin
 	 * @param Nette\Http\IResponse $httpResponse
 	 * @param Nette\Http\IRequest $httpRequest
 	 */
-	public function __construct($params, $cookieName, Nette\Http\IResponse $httpResponse, Nette\Http\IRequest $httpRequest)
-	{
+	public function __construct(
+		$params,
+		$cookieName,
+		Nette\Http\IResponse $httpResponse,
+		Nette\Http\IRequest $httpRequest
+	) {
 		$this->params = $params;
 		$this->cookieName = $cookieName;
 		$this->httpResponse = $httpResponse;
 		$this->httpRequest = $httpRequest;
 
-		$this->client = new Google\Client();
+		$this->client = new Google\Client;
 
 		$this->client->setClientId($this->params['clientId']);
 		$this->client->setClientSecret($this->params['clientSecret']);

src/SocialLogin.php

@@ -18,15 +18,13 @@ class SocialLogin extends BaseLogin
 	public $twitter;
 
 
-	/**
-	 * @param $params params from cnofig.neon
-	 * @param $params $cookieName cookie name - save last used service for login
-	 * @param Nette\Http\IResponse $httpResponse
-	 * @param Nette\Http\IRequest $httpRequest
-	 * @param Nette\Http\Session $session
-	 */
-	public function __construct($params, $cookieName, Nette\Http\IResponse $httpResponse, Nette\Http\IRequest $httpRequest, Nette\Http\Session $session)
-	{
+	public function __construct(
+		$params,
+		$cookieName,
+		Nette\Http\IResponse $httpResponse,
+		Nette\Http\IRequest $httpRequest,
+		Nette\Http\Session $session
+	) {
 		$this->params = $params;
 		$this->cookieName = $cookieName;
 		$this->httpResponse = $httpResponse;

src/TwitterLogin.php

@@ -36,8 +36,13 @@ class TwitterLogin extends BaseLogin
 	 * @param Nette\Http\IResponse $httpResponse
 	 * @param Nette\Http\IRequest $httpRequest
 	 */
-	public function __construct($params, $cookieName, Nette\Http\Session $session, Nette\Http\IResponse $httpResponse, Nette\Http\IRequest $httpRequest)
-	{
+	public function __construct(
+		$params,
+		$cookieName,
+		Nette\Http\Session $session,
+		Nette\Http\IResponse $httpResponse,
+		Nette\Http\IRequest $httpRequest
+	) {
 		$this->params = $params;
 		$this->cookieName = $cookieName;
 		$this->session = $session;

tests/php.ini

@@ -0,0 +1,3 @@
+[PHP]
+
+extension=curl

tests/tests/InstanceTest.phpt

@@ -7,7 +7,7 @@ use Tester;
 use Tester\Assert;
 use VencaX;
 
-$container = require __DIR__ . '/bootstrap.php';
+require __DIR__ . '/../../vendor/autoload.php';
 
 class InstanceTest extends Tester\TestCase
 {
@@ -29,6 +29,9 @@ class InstanceTest extends Tester\TestCase
 		$urlParseArray = parse_url($url);
 		parse_str($urlParseArray['query'], $urlParseQueryArray);
 
+		//Assert::same(false, $this->socialLogin->facebook->getSocialLoginCookie());
+		Assert::same(false, $this->socialLogin->facebook->isThisServiceLastLogin());
+
 		Assert::same('https', $urlParseArray['scheme']);
 		Assert::same('www.facebook.com', $urlParseArray['host']);
 		Assert::same('/v8.0/dialog/oauth', $urlParseArray['path']);
@@ -47,6 +50,9 @@ class InstanceTest extends Tester\TestCase
 		$urlParseArray = parse_url($url);
 		parse_str($urlParseArray['query'], $urlParseQueryArray);
 
+		//Assert::same(false, $this->socialLogin->google->getSocialLoginCookie());
+		Assert::same(false, $this->socialLogin->google->isThisServiceLastLogin());
+
 		Assert::same('https', $urlParseArray['scheme']);
 		Assert::same('accounts.google.com', $urlParseArray['host']);
 		Assert::same('/o/oauth2/auth', $urlParseArray['path']);
@@ -61,9 +67,10 @@ class InstanceTest extends Tester\TestCase
 	public function testTwitterLoginUrl()
 	{
 		//$url = $this->socialLogin->twitter->getLoginUrl();
-		Assert::same(true, true);
+		//Assert::same(false, $this->socialLogin->twitter->getSocialLoginCookie());
+		Assert::same(false, $this->socialLogin->twitter->isThisServiceLastLogin());
 	}
 }
 
-$test = new InstanceTest();
+$test = new InstanceTest;
 $test->run();