@@ -238,6 +238,9 @@ |
||
238 | 238 | } |
239 | 239 | } |
240 | 240 | |
241 | + /** |
|
242 | + * @param string $provider_id |
|
243 | + */ |
|
241 | 244 | private function returnToCallbackUrl($provider_id) { |
242 | 245 | // get the stored callback url |
243 | 246 | $callback_url = $this->hybridAuth->storage()->get( "hauth_session.$provider_id.hauth_return_to" ); |
@@ -2,14 +2,10 @@ |
||
2 | 2 | |
3 | 3 | namespace Azine\HybridAuthBundle\Controller; |
4 | 4 | |
5 | -use Symfony\Component\HttpFoundation\ParameterBag; |
|
6 | - |
|
7 | -use Symfony\Component\HttpFoundation\RedirectResponse; |
|
8 | - |
|
9 | -use Symfony\Component\HttpFoundation\Response; |
|
10 | - |
|
11 | -use Symfony\Component\HttpFoundation\Request; |
|
12 | - |
|
5 | +use Symfony\Component\HttpFoundation\ParameterBag; |
|
6 | +use Symfony\Component\HttpFoundation\RedirectResponse; |
|
7 | +use Symfony\Component\HttpFoundation\Response; |
|
8 | +use Symfony\Component\HttpFoundation\Request; |
|
13 | 9 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
14 | 10 | |
15 | 11 | class HybridEndPointController extends Controller { |
@@ -37,6 +37,9 @@ |
||
37 | 37 | |
38 | 38 | private $debugMsg = ''; |
39 | 39 | |
40 | + /** |
|
41 | + * @param string[] $matchList |
|
42 | + */ |
|
40 | 43 | public function __construct($femaleNames=null, $malesNames=null, $merge = false, $matchList = null){ |
41 | 44 | // Use the double_metaphone module if it's available, or fall back to the |
42 | 45 | // standard metaphone() PHP call if not |
@@ -1,8 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace Azine\HybridAuthBundle\Services; |
3 | 3 | |
4 | -use Azine\HybridAuthBundle\Entity\UserContact; |
|
5 | - |
|
6 | 4 | /** |
7 | 5 | * https://github.com/petewarden/genderfromname/blob/master/genderfromname.php |
8 | 6 |
@@ -2,7 +2,6 @@ |
||
2 | 2 | namespace Azine\HybridAuthBundle\Services; |
3 | 3 | |
4 | 4 | use Azine\HybridAuthBundle\Entity\UserContact; |
5 | - |
|
6 | 5 | use Symfony\Component\HttpFoundation\Session\Session; |
7 | 6 | |
8 | 7 | class AzineMergedBusinessNetworksProvider { |
@@ -24,9 +24,9 @@ |
||
24 | 24 | /** |
25 | 25 | * Guess the gender for a given firstname. The guesser will return an array with |
26 | 26 | * |
27 | - * @param \string $firstName |
|
27 | + * @param string $firstName |
|
28 | 28 | * @param int $looseness |
29 | - * @return \string sex => m | f |
|
29 | + * @return string sex => m | f |
|
30 | 30 | */ |
31 | 31 | public function gender($firstName, $looseness=1); |
32 | 32 | } |
33 | 33 | \ No newline at end of file |
@@ -1,14 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace Azine\HybridAuthBundle\Services; |
3 | 3 | |
4 | -use Azine\HybridAuthBundle\Entity\UserContact; |
|
5 | - |
|
6 | -use Symfony\Component\HttpFoundation\Session\Session; |
|
7 | - |
|
8 | -use Azine\HybridAuthBundle\DependencyInjection\AzineHybridAuthExtension; |
|
9 | - |
|
10 | -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
|
11 | - |
|
12 | 4 | interface GenderGuesser { |
13 | 5 | |
14 | 6 | /** |
@@ -1,7 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace Azine\HybridAuthBundle\Services; |
3 | 3 | |
4 | -use Azine\HybridAuthBundle\Entity\UserContact; |
|
5 | 4 | use Symfony\Bundle\FrameworkBundle\Tests\TestCase; |
6 | 5 | |
7 | 6 | class AzineGenderGuesserTest extends TestCase { |
@@ -3,11 +3,8 @@ |
||
3 | 3 | namespace Azine\HybridAuthBundle\Controller; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\RedirectResponse; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | - |
|
9 | 7 | use Symfony\Component\HttpFoundation\Request; |
10 | - |
|
11 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
12 | 9 | |
13 | 10 | class AzineHybridAuthJsonController extends Controller { |
@@ -59,6 +59,9 @@ |
||
59 | 59 | * @param string | null $email |
60 | 60 | * @param string | null $headline |
61 | 61 | * @param array | null $tags array of strings |
62 | + * @param string $gender |
|
63 | + * @param string $firstName |
|
64 | + * @param string $lastName |
|
62 | 65 | */ |
63 | 66 | public function __construct($provider, |
64 | 67 | $gender = null, |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * HybridAuthSessions will be restored from DB and/or cookies, according to the bundle configuration. |
78 | 78 | * |
79 | 79 | * @param $cookieSessionData |
80 | - * @param $provider |
|
80 | + * @param string $provider |
|
81 | 81 | * @return \Hybrid_Auth |
82 | 82 | */ |
83 | 83 | public function getInstance($cookieSessionData, $provider){ |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | /** |
132 | 132 | * Delete the HybridAuthSessionData entity from the database |
133 | - * @param $provider |
|
133 | + * @param string $provider |
|
134 | 134 | */ |
135 | 135 | public function deleteSession($provider){ |
136 | 136 | if($this->currentUser instanceof UserInterface) { |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | * @param $authSessionData |
178 | 178 | * @param string $provider_id |
179 | 179 | * @param boolean $require_login |
180 | - * @return \Hybrid_Provider_Model |
|
180 | + * @return \Hybrid_Provider_Adapter |
|
181 | 181 | */ |
182 | 182 | public function getProvider($authSessionData, $provider_id, $require_login = true){ |
183 | 183 | $adapter = $this->getInstance($authSessionData, $provider_id)->getAdapter($provider_id); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | |
203 | 203 | /** |
204 | 204 | * Get the Xing Adapter |
205 | - * @return \Hybrid_Providers_XING |
|
205 | + * @return \Hybrid_Provider_Adapter |
|
206 | 206 | */ |
207 | 207 | public function getXing(){ |
208 | 208 | return $this->getProvider(null, "xing"); |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | /** |
212 | 212 | * Get the Xing api (OAuthClient) |
213 | 213 | * |
214 | - * @return \OAuth1Client |
|
214 | + * @return \stdClass |
|
215 | 215 | */ |
216 | 216 | public function getXingApi(){ |
217 | 217 | return $this->getXing()->api(); |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | /** |
221 | 221 | * Get the LinkedIn Adapter |
222 | 222 | * |
223 | - * @return \Hybrid_Providers_LinkedIn |
|
223 | + * @return \Hybrid_Provider_Adapter |
|
224 | 224 | */ |
225 | 225 | public function getLinkedIn(){ |
226 | 226 | return $this->getProvider(null, "linkedin"); |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | /** |
230 | 230 | * Get the LinkedIn api (LinkedIn PHP-client) |
231 | 231 | * |
232 | - * @return \LinkedIn |
|
232 | + * @return \stdClass |
|
233 | 233 | */ |
234 | 234 | public function getLinkedInApi(){ |
235 | 235 | return $this->getLinkedIn()->api(); |
@@ -2,13 +2,11 @@ |
||
2 | 2 | namespace Azine\HybridAuthBundle\Services; |
3 | 3 | |
4 | 4 | use Azine\HybridAuthBundle\DependencyInjection\AzineHybridAuthExtension; |
5 | - |
|
6 | 5 | use Azine\HybridAuthBundle\Entity\HybridAuthSessionData; |
7 | 6 | use Doctrine\Common\Persistence\ObjectManager; |
8 | 7 | use Symfony\Component\HttpFoundation\Cookie; |
9 | 8 | use Symfony\Component\HttpFoundation\Request; |
10 | 9 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
11 | -use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; |
|
12 | 10 | use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; |
13 | 11 | use Symfony\Component\Security\Core\User\UserInterface; |
14 | 12 |