-
-
Save bangpound/83656ac94742c503617e6bddffdd7cb1 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/app/Pipes/Http/SaveConnectionsPipe.php b/app/Pipes/Http/SaveConnectionsPipe.php | |
index 3f54a0e..700935f 100644 | |
--- a/app/Pipes/Http/SaveConnectionsPipe.php | |
+++ b/app/Pipes/Http/SaveConnectionsPipe.php | |
@@ -12,7 +12,7 @@ class SaveConnectionsPipe extends HttpPipe | |
/** | |
* The connection repository | |
* | |
- * @var object | |
+ * @var ConnectionRepository | |
*/ | |
private $connections; | |
diff --git a/app/Repositories/Connection/ConnectionRepository.php b/app/Repositories/Connection/ConnectionRepository.php | |
index 3de2f48..0fefa25 100644 | |
--- a/app/Repositories/Connection/ConnectionRepository.php | |
+++ b/app/Repositories/Connection/ConnectionRepository.php | |
@@ -25,10 +25,10 @@ interface ConnectionRepository | |
/** | |
* Find the external service connection | |
* | |
- * @param $account String The AC account name, e.g. pbersch.activehosted.com | |
- * @param $service String An identifier for the type of connection, e.g. 'facebook_audience' | |
+ * @param string $account The AC account name, e.g. pbersch.activehosted.com | |
+ * @param string $service An identifier for the type of connection, e.g. 'facebook_audience' | |
* (matches service in em_dc_connection) | |
- * @param $externalId String The identifier for the connection on the 3rd party site | |
+ * @param string $externalId The identifier for the connection on the 3rd party site | |
* @return mixed A Connection object, or False if the connection is not found | |
*/ | |
public function findExternalConnection($account, $service, $externalId); | |
diff --git a/composer.lock b/composer.lock | |
index 4a50d80..0e168cd 100644 | |
--- a/composer.lock | |
+++ b/composer.lock | |
@@ -54,9 +54,12 @@ | |
"dist": { | |
"type": "path", | |
"url": "../deepdata-salesforce", | |
- "reference": "8c0643d4dfd2ef5fc44f80fdd28c025bbac1d1d4", | |
+ "reference": "46431222d37115bf630ce88ed30244df4d7cfd34", | |
"shasum": null | |
}, | |
+ "require": { | |
+ "stevenmaguire/oauth2-salesforce": "^2.0" | |
+ }, | |
"type": "library", | |
"extra": { | |
"branch-alias": { | |
@@ -1760,6 +1763,73 @@ | |
"time": "2017-03-01T16:00:46+00:00" | |
}, | |
{ | |
+ "name": "league/oauth2-client", | |
+ "version": "2.2.0", | |
+ "source": { | |
+ "type": "git", | |
+ "url": "https://github.com/thephpleague/oauth2-client.git", | |
+ "reference": "5f57366c99ac013ee9d78670c1fc0b9ca7871d95" | |
+ }, | |
+ "dist": { | |
+ "type": "zip", | |
+ "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/5f57366c99ac013ee9d78670c1fc0b9ca7871d95", | |
+ "reference": "5f57366c99ac013ee9d78670c1fc0b9ca7871d95", | |
+ "shasum": "" | |
+ }, | |
+ "require": { | |
+ "guzzlehttp/guzzle": "^6.0", | |
+ "paragonie/random_compat": "^2.0", | |
+ "php": ">=5.6.0" | |
+ }, | |
+ "require-dev": { | |
+ "eloquent/liberator": "^2.0", | |
+ "eloquent/phony": "^0.14.1", | |
+ "jakub-onderka/php-parallel-lint": "~0.9", | |
+ "phpunit/phpunit": "^5.0", | |
+ "squizlabs/php_codesniffer": "^2.0" | |
+ }, | |
+ "type": "library", | |
+ "extra": { | |
+ "branch-alias": { | |
+ "dev-2.x": "2.0.x-dev" | |
+ } | |
+ }, | |
+ "autoload": { | |
+ "psr-4": { | |
+ "League\\OAuth2\\Client\\": "src/" | |
+ } | |
+ }, | |
+ "notification-url": "https://packagist.org/downloads/", | |
+ "license": [ | |
+ "MIT" | |
+ ], | |
+ "authors": [ | |
+ { | |
+ "name": "Alex Bilbie", | |
+ "email": "[email protected]", | |
+ "homepage": "http://www.alexbilbie.com", | |
+ "role": "Developer" | |
+ }, | |
+ { | |
+ "name": "Woody Gilk", | |
+ "homepage": "https://github.com/shadowhand", | |
+ "role": "Contributor" | |
+ } | |
+ ], | |
+ "description": "OAuth 2.0 Client Library", | |
+ "keywords": [ | |
+ "Authentication", | |
+ "SSO", | |
+ "authorization", | |
+ "identity", | |
+ "idp", | |
+ "oauth", | |
+ "oauth2", | |
+ "single sign on" | |
+ ], | |
+ "time": "2017-02-02T04:08:45+00:00" | |
+ }, | |
+ { | |
"name": "monolog/monolog", | |
"version": "1.22.1", | |
"source": { | |
@@ -2173,6 +2243,61 @@ | |
"time": "2016-10-10T12:19:37+00:00" | |
}, | |
{ | |
+ "name": "stevenmaguire/oauth2-salesforce", | |
+ "version": "2.0.1", | |
+ "source": { | |
+ "type": "git", | |
+ "url": "https://github.com/stevenmaguire/oauth2-salesforce.git", | |
+ "reference": "37e1a2a59240e14b1f95d416a4f8d3d57199822b" | |
+ }, | |
+ "dist": { | |
+ "type": "zip", | |
+ "url": "https://api.github.com/repos/stevenmaguire/oauth2-salesforce/zipball/37e1a2a59240e14b1f95d416a4f8d3d57199822b", | |
+ "reference": "37e1a2a59240e14b1f95d416a4f8d3d57199822b", | |
+ "shasum": "" | |
+ }, | |
+ "require": { | |
+ "league/oauth2-client": "^2.0" | |
+ }, | |
+ "require-dev": { | |
+ "mockery/mockery": "~0.9", | |
+ "phpunit/phpunit": "~4.0", | |
+ "squizlabs/php_codesniffer": "~2.0" | |
+ }, | |
+ "type": "library", | |
+ "extra": { | |
+ "branch-alias": { | |
+ "dev-master": "1.0.x-dev" | |
+ } | |
+ }, | |
+ "autoload": { | |
+ "psr-4": { | |
+ "Stevenmaguire\\OAuth2\\Client\\": "src/" | |
+ } | |
+ }, | |
+ "notification-url": "https://packagist.org/downloads/", | |
+ "license": [ | |
+ "MIT" | |
+ ], | |
+ "authors": [ | |
+ { | |
+ "name": "Steven Maguire", | |
+ "email": "[email protected]", | |
+ "homepage": "https://github.com/stevenmaguire" | |
+ } | |
+ ], | |
+ "description": "Salesforce OAuth 2.0 Client Provider for The PHP League OAuth2-Client", | |
+ "keywords": [ | |
+ "authorisation", | |
+ "authorization", | |
+ "client", | |
+ "oauth", | |
+ "oauth2", | |
+ "salesforce" | |
+ ], | |
+ "time": "2017-02-03T19:23:57+00:00" | |
+ }, | |
+ { | |
"name": "symfony/console", | |
"version": "v3.2.6", | |
"source": { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment