Merge branch 'master' into 1.0

README.md

@@ -126,6 +126,8 @@ so please help them out with a pull request if you notice this.
 
 - [Battle.net](https://packagist.org/packages/depotwarehouse/oauth2-bnet)
 - [Odnoklassniki](https://packagist.org/packages/aego/oauth2-odnoklassniki)
+- [Yandex](https://packagist.org/packages/aego/oauth2-yandex)
+- [Mail.ru](https://packagist.org/packages/aego/oauth2-mailru)
 - [QQ](https://github.com/tlikai/oauth2-client)
 - [Weibo](https://github.com/tlikai/oauth2-client)
 - [Meetup](https://github.com/howlowck/meetup-oauth2-provider)

composer.json

@@ -41,7 +41,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "0.5.x-dev"
+            "dev-master": "0.6.x-dev"
         }
     }
 }

src/Provider/Microsoft.php

@@ -12,12 +12,12 @@ class Microsoft extends AbstractProvider
 
     public function urlAuthorize()
     {
-        return 'https://oauth.live.com/authorize';
+        return 'https://login.live.com/oauth20_authorize.srf';
     }
 
     public function urlAccessToken()
     {
-        return 'https://oauth.live.com/token';
+        return 'https://login.live.com/oauth20_token.srf';
     }
 
     public function urlUserDetails(AccessToken $token)

test/src/Provider/MicrosoftTest.php

@@ -38,12 +38,20 @@ class MicrosoftTest extends \PHPUnit_Framework_TestCase
         $this->assertNotNull($this->provider->state);
     }
 
+    public function testUrlAuthorize()
+    {
+        $url = $this->provider->urlAuthorize();
+        $uri = parse_url($url);
+
+        $this->assertEquals('/oauth20_authorize.srf', $uri['path']);
+    }
+
     public function testUrlAccessToken()
     {
         $url = $this->provider->urlAccessToken();
         $uri = parse_url($url);
 
-        $this->assertEquals('/token', $uri['path']);
+        $this->assertEquals('/oauth20_token.srf', $uri['path']);
     }
 
     public function testGetAccessToken()