Merge branch 'feature/275' into develop

Forward port #275

- Drop changes as obsolete for 4.0

Author: Xerkus

CHANGELOG.md

@@ -32,6 +32,30 @@ All notable changes to this project will be documented in this file, in reverse
 - [#230](https://github.com/zendframework/zend-servicemanager/pull/230) fixes a
   problem in detecting cyclic aliases, ensuring they are detected correctly.
 
+## 3.4.0 - TBD
+
+### Added
+
+- [#275](https://github.com/zendframework/zend-servicemanager/pull/275) Enables
+  plugin managers to accept as a creation context PSR Containers not implementing
+  Interop interface
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 3.3.2 - 2018-01-29
 
 ### Added
@@ -91,7 +115,7 @@ All notable changes to this project will be documented in this file, in reverse
   container-interop at a minimum version of 1.2.0, and adding a requirement on
   psr/container 1.0. `Zend\ServiceManager\ServiceLocatorInterface` now
   explicitly extends the `ContainerInterface` from both projects.
-  
+
   Factory interfaces still typehint against the container-interop variant, as
   changing the typehint would break backwards compatibility. Users can
   duck-type most of these interfaces, however, by creating callables or
@@ -369,7 +393,7 @@ Documentation is now available at http://zend-servicemanager.rtfd.org
   (previously, it was the third).
 
   Example:
-  
+
   ```php
   $sm = new \Zend\ServiceManager\ServiceManager([
       'factories'  => [
@@ -378,7 +402,7 @@ Documentation is now available at http://zend-servicemanager.rtfd.org
           'MyClassC'      => 'MyFactory' // This is equivalent as using ::class
       ],
   ]);
-  
+
   $sm->get(MyClassA::class); // MyFactory will receive MyClassA::class as second parameter
   ```
 
@@ -397,7 +421,7 @@ Documentation is now available at http://zend-servicemanager.rtfd.org
         if ($instance instanceof \Zend\Validator\ValidatorInterface) {
             return;
         }
-    
+
         throw new InvalidServiceException(sprintf(
             'Plugin manager "%s" expected an instance of type "%s", but "%s" was received',
              __CLASS__,
@@ -407,19 +431,19 @@ Documentation is now available at http://zend-servicemanager.rtfd.org
     }
   }
   ```
-  
+
   In version 3, this becomes:
-  
+
   ```php
   use Zend\ServiceManager\AbstractPluginManager;
   use Zend\Validator\ValidatorInterface;
-  
+
   class MyPluginManager extends AbstractPluginManager
   {
       protected $instanceOf = ValidatorInterface::class;
   }
   ```
-  
+
   Of course, you can still override the `validate` method if your logic is more
   complex.
 
@@ -463,17 +487,17 @@ changes, outlined in this section.
   service manager; you can pass the configuration array directly instead.
 
   In version 2.x:
-  
+
   ```php
   $config = new \Zend\ServiceManager\Config([
       'factories'  => [...]
   ]);
-  
+
   $sm = new \Zend\ServiceManager\ServiceManager($config);
   ```
-  
+
   In ZF 3.x:
-  
+
   ```php
   $sm = new \Zend\ServiceManager\ServiceManager([
       'factories'  => [...]
@@ -502,7 +526,7 @@ changes, outlined in this section.
   argument if present.
 
   For instance, here is a simple version 2.x factory:
-  
+
   ```php
   class MyFactory implements FactoryInterface
   {
@@ -512,9 +536,9 @@ changes, outlined in this section.
       }
   }
   ```
-  
+
   The equivalent version 3 factory:
-  
+
   ```php
   class MyFactory implements FactoryInterface
   {
@@ -544,23 +568,23 @@ changes, outlined in this section.
   through the interface.
 
   In version 2.x, if a factory was set to a service name defined in a plugin manager:
-  
+
   ```php
   class MyFactory implements FactoryInterface
   {
       function createService(ServiceLocatorInterface $sl)
       {
           // $sl is actually a plugin manager
-        
+
           $parentLocator = $sl->getServiceLocator();
-        
+
           // ...
       }
   }
   ```
-  
+
   In version 3:
-  
+
   ```php
   class MyFactory implements FactoryInterface
   {

src/AbstractPluginManager.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-servicemanager 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/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\ServiceManager;

test/AbstractPluginManagerTest.php

@@ -1,8 +1,8 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-servicemanager 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/zendframework/zend-servicemanager for the canonical source repository
+ * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-servicemanager/blob/master/LICENSE.md New BSD License
  */
 
 namespace ZendTest\ServiceManager;