class DI definitions changed to '__class' keyword

.travis.yml

@@ -24,7 +24,7 @@ install:
 
 before_script:
   - |
-    if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
+    if [ $TRAVIS_PHP_VERSION = '7.1' ]; then
       PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
     fi
 

LICENSE.md

@@ -1,7 +1,7 @@
 The Yii framework is free software. It is released under the terms of
 the following BSD License.
 
-Copyright © 2008-2013 by Yii Software LLC (http://www.yiisoft.com)
+Copyright © 2008-2018 by Yii Software LLC (http://www.yiisoft.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

composer.json

@@ -32,10 +32,10 @@
         }
     ],
     "autoload": {
-        "psr-4": { "yii\\authclient\\": "src" }
+        "psr-4": {"yii\\authclient\\": "src"}
     },
     "autoload-dev": {
-        "psr-4": {"yiiunit\\authclient\\": "tests/"}
+        "psr-4": {"yiiunit\\authclient\\": "tests"}
     },
     "extra": {
         "branch-alias": {

docs/guide-ru/installation.md

@@ -25,15 +25,15 @@ composer require --prefer-dist yiisoft/yii2-authclient "~2.1.0"
 return [
     'components' => [
         'authClientCollection' => [
-            'class' => 'yii\authclient\Collection',
+            '__class' => yii\authclient\Collection::class,
             'clients' => [
                 'google' => [
-                    'class' => 'yii\authclient\clients\Google',
+                    '__class' => yii\authclient\clients\Google::class,
                     'clientId' => 'google_client_id',
                     'clientSecret' => 'google_client_secret',
                 ],
                 'facebook' => [
-                    'class' => 'yii\authclient\clients\Facebook',
+                    '__class' => yii\authclient\clients\Facebook::class,
                     'clientId' => 'facebook_client_id',
                     'clientSecret' => 'секретный_ключ_facebook_client',
                 ],

docs/guide-ru/oauth-direct-authentication.md

@@ -67,7 +67,7 @@ $oauthClient = new Google();
 $accessToken = $oauthClient->authenticateUserJwt(
     'your-service-account-id@developer.gserviceaccount.com',
     [
-        'class' => RsaSha::className(),
+        '__class' => RsaSha::class,
         'algorithm' => OPENSSL_ALGO_SHA256,
         'privateCertificate' => "-----BEGIN PRIVATE KEY-----   ...   -----END PRIVATE KEY-----\n"
     ]

docs/guide-ru/quick-start.md

@@ -15,7 +15,7 @@ class SiteController extends Controller
     {
         return [
             'auth' => [
-                'class' => 'yii\authclient\AuthAction',
+                '__class' => yii\authclient\AuthAction::class,
                 'successCallback' => [$this, 'onAuthSuccess'],
             ],
         ];

docs/guide-ru/setup-http-client.md

@@ -26,19 +26,19 @@ $authClient = new Google([
 return [
     'components' => [
         'authClientCollection' => [
-            'class' => 'yii\authclient\Collection',
+            '__class' => yii\authclient\Collection::class,
             // все Auth клиенты будут использовать эту конфигурацию для HTTP клиента:
             'httpClient' => [
-                'transport' => 'yii\httpclient\CurlTransport',
+                'transport' => yii\httpclient\CurlTransport::class,
             ],
             'clients' => [
                 'google' => [
-                    'class' => 'yii\authclient\clients\Google',
+                    '__class' => yii\authclient\clients\Google::class,
                     'clientId' => 'google_client_id',
                     'clientSecret' => 'google_client_secret',
                 ],
                 'facebook' => [
-                    'class' => 'yii\authclient\clients\Facebook',
+                    '__class' => yii\authclient\clients\Facebook::class,
                     'clientId' => 'facebook_client_id',
                     'clientSecret' => 'facebook_client_secret',
                 ],

docs/guide/installation.md

@@ -25,15 +25,15 @@ After extension is installed you need to setup auth client collection applicatio
 return [
     'components' => [
         'authClientCollection' => [
-            'class' => yii\authclient\Collection::class,
+            '__class' => yii\authclient\Collection::class,
             'clients' => [
                 'google' => [
-                    'class' => yii\authclient\clients\Google::class,
+                    '__class' => yii\authclient\clients\Google::class,
                     'clientId' => 'google_client_id',
                     'clientSecret' => 'google_client_secret',
                 ],
                 'facebook' => [
-                    'class' => yii\authclient\clients\Facebook::class,
+                    '__class' => yii\authclient\clients\Facebook::class,
                     'clientId' => 'facebook_client_id',
                     'clientSecret' => 'facebook_client_secret',
                 ],

docs/guide/oauth-direct-authentication.md

@@ -67,7 +67,7 @@ $oauthClient = new Google();
 $accessToken = $oauthClient->authenticateUserJwt(
     'your-service-account-id@developer.gserviceaccount.com',
     [
-        'class' => RsaSha::className(),
+        '__class' => RsaSha::class,
         'algorithm' => OPENSSL_ALGO_SHA256,
         'privateCertificate' => "-----BEGIN PRIVATE KEY-----   ...   -----END PRIVATE KEY-----\n"
     ]

docs/guide/open-id-connect.md

@@ -9,10 +9,10 @@ Application configuration example:
 ```php
 'components' => [
     'authClientCollection' => [
-        'class' => yii\authclient\Collection::class,
+        '__class' => yii\authclient\Collection::class,
         'clients' => [
             'google' => [
-                'class' => yii\authclient\OpenIdConnect::class,
+                '__class' => yii\authclient\OpenIdConnect::class,
                 'issuerUrl' => 'https://accounts.google.com',
                 'clientId' => 'google_client_id',
                 'clientSecret' => 'google_client_secret',

docs/guide/quick-start.md

@@ -15,7 +15,7 @@ class SiteController extends Controller
     {
         return [
             'auth' => [
-                'class' => \yii\authclient\AuthAction::class,
+                '__class' => \yii\authclient\AuthAction::class,
                 'successCallback' => [$this, 'onAuthSuccess'],
             ],
         ];

docs/guide/setup-http-client.md

@@ -26,19 +26,19 @@ Application configuration example:
 return [
     'components' => [
         'authClientCollection' => [
-            'class' => yii\authclient\Collection::class,
+            '__class' => yii\authclient\Collection::class,
             // all Auth clients will use this configuration for HTTP client:
             'httpClient' => [
                 'transport' => yii\httpclient\CurlTransport::class,
             ],
             'clients' => [
                 'google' => [
-                    'class' => yii\authclient\clients\Google::class,
+                    '__class' => yii\authclient\clients\Google::class,
                     'clientId' => 'google_client_id',
                     'clientSecret' => 'google_client_secret',
                 ],
                 'facebook' => [
-                    'class' => yii\authclient\clients\Facebook::class,
+                    '__class' => yii\authclient\clients\Facebook::class,
                     'clientId' => 'facebook_client_id',
                     'clientSecret' => 'facebook_client_secret',
                 ],

src/AuthAction.php

@@ -30,7 +30,7 @@
  *     {
  *         return [
  *             'auth' => [
- *                 'class' => 'yii\authclient\AuthAction',
+ *                 '__class' => \yii\authclient\AuthAction::class,
  *                 'successCallback' => [$this, 'successCallback'],
  *             ],
  *         ]

src/BaseOAuth.php

@@ -187,8 +187,8 @@ protected function defaultRequestOptions()
      */
     protected function createSignatureMethod(array $signatureMethodConfig)
     {
-        if (!array_key_exists('class', $signatureMethodConfig)) {
-            $signatureMethodConfig['class'] = signature\HmacSha1::class;
+        if (!array_key_exists('__class', $signatureMethodConfig)) {
+            $signatureMethodConfig['__class'] = signature\HmacSha1::class;
         }
         return Yii::createObject($signatureMethodConfig);
     }
@@ -200,8 +200,8 @@ protected function createSignatureMethod(array $signatureMethodConfig)
      */
     protected function createToken(array $tokenConfig = [])
     {
-        if (!array_key_exists('class', $tokenConfig)) {
-            $tokenConfig['class'] = OAuthToken::class;
+        if (!array_key_exists('__class', $tokenConfig)) {
+            $tokenConfig['__class'] = OAuthToken::class;
         }
         return Yii::createObject($tokenConfig);
     }

src/Collection.php

@@ -19,15 +19,15 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'google' => [
- *                 'class' => yii\authclient\clients\Google::class,
+ *                 '__class' => yii\authclient\clients\Google::class,
  *                 'clientId' => 'google_client_id',
  *                 'clientSecret' => 'google_client_secret',
  *              ],
  *             'facebook' => [
- *                 'class' => yii\authclient\clients\Facebook::class,
+ *                 '__class' => yii\authclient\clients\Facebook::class,
  *                 'clientId' => 'facebook_client_id',
  *                 'clientSecret' => 'facebook_client_secret',
  *             ],

src/OpenIdConnect.php

@@ -26,10 +26,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'google' => [
- *                 'class' => yii\authclient\OpenIdConnect::class,
+ *                 '__class' => yii\authclient\OpenIdConnect::class,
  *                 'issuerUrl' => 'https://accounts.google.com',
  *                 'clientId' => 'google_client_id',
  *                 'clientSecret' => 'google_client_secret',

src/clients/Facebook.php

@@ -20,10 +20,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'facebook' => [
- *                 'class' => yii\authclient\clients\Facebook::class,
+ *                 '__class' => yii\authclient\clients\Facebook::class,
  *                 'clientId' => 'facebook_client_id',
  *                 'clientSecret' => 'facebook_client_secret',
  *             ],

src/clients/GitHub.php

@@ -19,10 +19,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'github' => [
- *                 'class' => yii\authclient\clients\GitHub::class,
+ *                 '__class' => yii\authclient\clients\GitHub::class,
  *                 'clientId' => 'github_client_id',
  *                 'clientSecret' => 'github_client_secret',
  *             ],

src/clients/Google.php

@@ -22,10 +22,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'google' => [
- *                 'class' => yii\authclient\clients\Google::class,
+ *                 '__class' => yii\authclient\clients\Google::class,
  *                 'clientId' => 'google_client_id',
  *                 'clientSecret' => 'google_client_secret',
  *             ],

src/clients/GoogleHybrid.php

@@ -16,10 +16,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'google' => [
- *                 'class' => yii\authclient\clients\GoogleHybrid::class,
+ *                 '__class' => yii\authclient\clients\GoogleHybrid::class,
  *                 'clientId' => 'google_client_id',
  *                 'clientSecret' => 'google_client_secret',
  *             ],
@@ -41,7 +41,7 @@
  *     // ...
  *     'viewOptions' => [
  *         'widget' => [
- *             'class' => yii\authclient\widgets\GooglePlusButton::class,
+ *             '__class' => yii\authclient\widgets\GooglePlusButton::class,
  *             'buttonHtmlOptions' => [
  *                 'data-approvalprompt' => 'force'
  *             ],
@@ -80,7 +80,7 @@ protected function defaultViewOptions()
     {
         return [
             'widget' => [
-                'class' => \yii\authclient\widgets\GooglePlusButton::class
+                '__class' => \yii\authclient\widgets\GooglePlusButton::class
             ],
         ];
     }

src/clients/LinkedIn.php

@@ -21,10 +21,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'linkedin' => [
- *                 'class' => yii\authclient\clients\LinkedIn::class,
+ *                 '__class' => yii\authclient\clients\LinkedIn::class,
  *                 'clientId' => 'linkedin_client_id',
  *                 'clientSecret' => 'linkedin_client_secret',
  *             ],

src/clients/Live.php

@@ -19,10 +19,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'live' => [
- *                 'class' => yii\authclient\clients\Live::class,
+ *                 '__class' => yii\authclient\clients\Live::class,
  *                 'clientId' => 'live_client_id',
  *                 'clientSecret' => 'live_client_secret',
  *             ],

src/clients/Twitter.php

@@ -19,10 +19,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'twitter' => [
- *                 'class' => yii\authclient\clients\Twitter::class,
+ *                 '__class' => yii\authclient\clients\Twitter::class,
  *                 'attributeParams' => [
  *                     'include_email' => 'true'
  *                 ],

src/clients/VKontakte.php

@@ -21,10 +21,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'vkontakte' => [
- *                 'class' => yii\authclient\clients\VKontakte::class,
+ *                 '__class' => yii\authclient\clients\VKontakte::class,
  *                 'clientId' => 'vkontakte_client_id',
  *                 'clientSecret' => 'vkontakte_client_secret',
  *             ],

src/clients/Yandex.php

@@ -19,10 +19,10 @@
  * ```php
  * 'components' => [
  *     'authClientCollection' => [
- *         'class' => yii\authclient\Collection::class,
+ *         '__class' => yii\authclient\Collection::class,
  *         'clients' => [
  *             'yandex' => [
- *                 'class' => yii\authclient\clients\Yandex::class,
+ *                 '__class' => yii\authclient\clients\Yandex::class,
  *                 'clientId' => 'yandex_client_id',
  *                 'clientSecret' => 'yandex_client_secret',
  *             ],

tests/BaseOAuthTest.php

@@ -105,11 +105,11 @@ public function testSetupComponentsByConfig()
         $this->assertEquals($oauthToken['token'], $oauthClient->getAccessToken()->getToken(), 'Unable to setup token as config!');
 
         $oauthSignatureMethod = [
-            'class' => \yii\authclient\signature\PlainText::class
+            '__class' => \yii\authclient\signature\PlainText::class
         ];
         $oauthClient->setSignatureMethod($oauthSignatureMethod);
         $returnedSignatureMethod = $oauthClient->getSignatureMethod();
-        $this->assertEquals($oauthSignatureMethod['class'], get_class($returnedSignatureMethod), 'Unable to setup signature method as config!');
+        $this->assertEquals($oauthSignatureMethod['__class'], get_class($returnedSignatureMethod), 'Unable to setup signature method as config!');
     }
 
     /**