Merge branch 'release/1.18.0'

Author: Brian Retterer

CHANGES.md

@@ -2,6 +2,15 @@ stormpath-sdk-php Changelog
 ===========================
 
 
+Version 1.18.0
+--------------
+
+Released on January 3, 2017
+
+ - Happy New Year!
+ - Added OrgNameKey to Password Grant Type (Resolves #61)
+ - Update all copyright dates to 2017
+ 
 Version 1.17.2
 --------------
 

CONTRIBUTING.md

@@ -1,3 +1,7 @@
 # Contributing
 
-You can make your own contributions by forking the dev branch, making your changes, and issuing pull-requests on the dev branch.
+Contributions, bug reports and issues are very welcome. Stormpath regularly maintains this repository, and are quick to review pull requests and accept changes!
+
+You can make your own contributions by forking the `dev` branch of this repository, making your changes, and issuing pull request on the `dev` branch.
+
+Any Pull request made directly to `master` or other branches will be closed.

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2016 Stormpath, Inc.
+Copyright 2017 Stormpath, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

README.md

@@ -69,6 +69,6 @@ If you feel the contributions require document changes as well, or the contribut
 
 ## Copyright
 
-Copyright © 2013-2016 Stormpath, Inc. and contributors.
+Copyright © 2013-2017 Stormpath, Inc. and contributors.
 
 This project is open-source via the [Apache 2.0 License](http://www.apache.org/licenses/LICENSE-2.0).

src/ApiKey.php

@@ -1,9 +1,6 @@
 <?php
-
-namespace Stormpath;
-
-/*
- * Copyright 2016 Stormpath, Inc.
+/**
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +13,10 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
+
+namespace Stormpath;
 class ApiKey
 {
 

src/Authc/Api/ApiAuthenticationResult.php

@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2016 Stormpath, Inc.
+/**
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 namespace Stormpath\Authc\Api;

src/Authc/Api/ApiKeyEncryptionOptions.php

@@ -1,9 +1,6 @@
 <?php
-
-namespace Stormpath\Authc\Api;
-
-/*
- * Copyright 2016 Stormpath, Inc.
+/**
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +13,11 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
+namespace Stormpath\Authc\Api;
+
 class ApiKeyEncryptionOptions
 {
     const ENCRYPT_SECRET = 'encryptSecret';

src/Authc/Api/ApiKeyEncryptionUtils.php

@@ -1,12 +1,6 @@
 <?php
-
-namespace Stormpath\Authc\Api;
-
-use phpseclib\Crypt\AES as ModernAES;
-use Crypt_AES as OldAES;
-
-/*
- * Copyright 2016 Stormpath, Inc.
+/**
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +13,14 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
+namespace Stormpath\Authc\Api;
+
+use phpseclib\Crypt\AES as ModernAES;
+use Crypt_AES as OldAES;
+
 class ApiKeyEncryptionUtils
 {
     public static function decrypt($secret, $password, ApiKeyEncryptionOptions $options)

src/Authc/Api/ApiRequestAuthenticator.php

@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2016 Stormpath, Inc.
+/**
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 namespace Stormpath\Authc\Api;

src/Authc/Api/AuthenticatorResult.php

@@ -1,6 +1,6 @@
 <?php
-/*
- * Copyright 2016 Stormpath, Inc.
+/**
+ * Copyright 2017 Stormpath, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,6 +13,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 namespace Stormpath\Authc\Api;