Merge branch 'hotfix/41' into develop

Forward port #41
zendframework · Jan 4, 2018 · 4e40283 · 4e40283
2 parents ed87809 + 51ec9c0
commit 4e40283
Show file tree

Hide file tree

Showing 20 changed files with 60 additions and 60 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json;

diff --git a/src/Encoder.php b/src/Encoder.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json;

diff --git a/src/Exception/BadMethodCallException.php b/src/Exception/BadMethodCallException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json\Exception;

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json\Exception;

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json\Exception;

diff --git a/src/Exception/RecursionException.php b/src/Exception/RecursionException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json\Exception;

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json\Exception;

diff --git a/src/Expr.php b/src/Expr.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json;

diff --git a/src/Json.php b/src/Json.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Json;

diff --git a/test/JsonTest.php b/test/JsonTest.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json;

diff --git a/test/TestAsset/Bar.php b/test/TestAsset/Bar.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/Item.php b/test/TestAsset/Item.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/JsonSerializableBuiltinImpl.php b/test/TestAsset/JsonSerializableBuiltinImpl.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/JsonSerializableZFImpl.php b/test/TestAsset/JsonSerializableZFImpl.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/TestIteratorAggregate.php b/test/TestAsset/TestIteratorAggregate.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/TestObject.php b/test/TestAsset/TestObject.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/ToJSONClass.php b/test/TestAsset/ToJSONClass.php
@@ -1,8 +1,8 @@
 <?php // @codingStandardsIgnoreFile
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/ToJSONWithExpr.php b/test/TestAsset/ToJSONWithExpr.php
@@ -1,8 +1,8 @@
 <?php // @codingStandardsIgnoreFile
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/ZF11167ToArrayClass.php b/test/TestAsset/ZF11167ToArrayClass.php
@@ -1,8 +1,8 @@
 <?php // @codingStandardsIgnoreFile
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;

diff --git a/test/TestAsset/ZF11167ToArrayToJsonClass.php b/test/TestAsset/ZF11167ToArrayToJsonClass.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-json for the canonical source repository
- * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
- * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @see       https://github.com/zendframwork/zend-json for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframwork/zend-json/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\Json\TestAsset;