[phalcon/incubator#971] Mass unification to collectionsManager

README.md

@@ -31,7 +31,7 @@ Manager controls the initialization of collections, keeping record of relations
 use Phalcon\Incubator\MongoDB\Mvc\Collection\Manager;
 
 $di->set(
-    'collectionManager',
+    'collectionsManager',
     function () {
         return new Manager();
     }
@@ -72,68 +72,60 @@ $robots = RobotsCollection::find();
 echo "There are ", count($robots), "\n";
 
 // How many mechanical robots are there?
-$robots = RobotsCollection::find(
- [
-     [
-         "type" => "mechanical",
-     ],
- ]
-);
+$robots = RobotsCollection::find([
+    [
+        "type" => "mechanical",
+    ],
+]);
 
 echo "There are ", count(robots), "\n";
 
 // Get and print virtual robots ordered by name
-$robots = RobotsCollection::findFirst(
- [
-     [
-         "type" => "virtual"
-     ],
-     "order" => [
-         "name" => 1,
-     ],
- ]
-);
+$robots = RobotsCollection::findFirst([
+    [
+        "type" => "virtual",
+    ],
+    "order" => [
+        "name" => 1,
+    ],
+]);
 
 foreach ($robots as $robot) {
-   echo $robot->name, "\n";
+    echo $robot->name, "\n";
 }
 
 // Get first 100 virtual robots ordered by name
-$robots = RobotsCollection::find(
- [
-     [
-         "type" => "virtual",
-     ],
-     "order" => [
-         "name" => 1,
-     ],
-     "limit" => 100,
- ]
-);
+$robots = RobotsCollection::find([
+    [
+        "type" => "virtual",
+    ],
+    "order" => [
+        "name" => 1,
+    ],
+    "limit" => 100,
+]);
 
 foreach (RobotsCollection as $robot) {
-   echo $robot->name, "\n";
+    echo $robot->name, "\n";
 }
 
-$robot = RobotsCollection::findFirst(
- [
-     [
-         "_id" => new ObjectId("45cbc4a0e4123f6920000002"),
-     ],
- ]
-);
+$robot = RobotsCollection::findFirst([
+    [
+        "_id" => new ObjectId("45cbc4a0e4123f6920000002"),
+    ],
+]);
 
 // Find robot by using \MongoDB\BSON\ObjectId object
 $robot = RobotsCollection::findById(
- new ObjectId("545eb081631d16153a293a66")
+    new ObjectId("545eb081631d16153a293a66")
 );
 
 // Find robot by using id as sting
 $robot = RobotsCollection::findById("45cbc4a0e4123f6920000002");
 
 // Validate input
 if ($robot = RobotsCollection::findById($_POST["id"])) {
- // ...
+    // ...
 }
 ```
 

src/Mvc/Collection.php

@@ -849,7 +849,7 @@ public static function findById($id): ?CollectionInterface
             $className = static::class;
             $collection = new $className();
 
-            if ($collection->getCollectionManager()->isUsingImplicitObjectIds($collection)) {
+            if ($collection->getCollectionsManager()->isUsingImplicitObjectIds($collection)) {
                 $objectId = new ObjectId($id);
             } else {
                 $objectId = $id;
@@ -870,7 +870,7 @@ public static function findById($id): ?CollectionInterface
      *
      * @return ManagerInterface
      */
-    public function getCollectionManager(): ManagerInterface
+    public function getCollectionsManager(): ManagerInterface
     {
         return $this->collectionsManager;
     }
@@ -1243,10 +1243,10 @@ public function unserialize($data): void
             /**
              * Gets the default collectionsManager service
              */
-            $manager = $container->getShared("collectionManager");
+            $manager = $container->getShared('collectionsManager');
             if ($manager === null) {
                 throw new Exception(
-                    "The injected service 'collectionManager' is not valid"
+                    "The injected service 'collectionsManager' is not valid"
                 );
             }
 

src/Mvc/Collection/Manager.php

@@ -28,13 +28,13 @@
  * These components control the initialization of collections, keeping record of relations
  * between the different collections of the application.
  *
- * A CollectionManager is injected to a collection via a Dependency Injector Container such as Phalcon\Di.
+ * A CollectionsManager is injected to a collection via a Dependency Injector Container such as Phalcon\Di.
  *
  * <code>
  * $di = new \Phalcon\Di();
  *
  * $di->set(
- *     "collectionManager",
+ *     "collectionsManager",
  *     function () {
  *         return new \Phalcon\Incubator\MongoDB\Mvc\Collection\Manager();
  *     }
@@ -181,7 +181,7 @@ public function initialize(CollectionInterface $collection): void
              * If an EventsManager is available we pass to it every initialized collection
              */
             if (is_object($this->eventsManager)) {
-                $this->eventsManager->fire('collectionManager:afterInitialize', $collection);
+                $this->eventsManager->fire('collectionsManager:afterInitialize', $collection);
             }
 
             $this->initialized[$className] = $collection;

src/Mvc/Collection/ManagerInterface.php

@@ -21,13 +21,13 @@
  * These components control the initialization of collections, keeping record of relations
  * between the different collections of the application.
  *
- * A CollectionManager is injected to a collection via a Dependency Injector Container such as Phalcon\Di.
+ * A CollectionsManager is injected to a collection via a Dependency Injector Container such as Phalcon\Di.
  *
  * <code>
  * $di = new \Phalcon\Di\Di();
  *
  * $di->set(
- *     "collectionManager",
+ *     "collectionsManager",
  *     function() {
  *         return new \Phalcon\Incubator\Mvc\Collection\Manager();
  *     }

tests/_data/fixtures/Traits/DiTrait.php

@@ -17,7 +17,7 @@
 use Phalcon\Di\Di;
 use Phalcon\Di\DiInterface;
 use Phalcon\Di\FactoryDefault;
-use Phalcon\Incubator\MongoDB\Mvc\Collection\Manager as CollectionManager;
+use Phalcon\Incubator\MongoDB\Mvc\Collection\Manager as CollectionsManager;
 
 trait DiTrait
 {
@@ -53,11 +53,11 @@ protected function resetDi()
     }
 
     /**
-     * Setup a new Collection Manager
+     * Set up a new Collection Manager
      */
-    protected function setDiCollectionManager()
+    protected function setDiCollectionsManager()
     {
-        $this->container->setShared('collectionsManager', CollectionManager::class);
+        $this->container->setShared('collectionsManager', CollectionsManager::class);
     }
 
     /**

tests/integration/Collection/AggregateCest.php

@@ -32,7 +32,7 @@ class AggregateCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots())->getSource();

tests/integration/Collection/AppendMessageCest.php

@@ -26,7 +26,7 @@ class AppendMessageCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/AssignCest.php

@@ -25,7 +25,7 @@ class AssignCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/CloneResultCest.php

@@ -32,7 +32,7 @@ class CloneResultCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots)->getSource();

tests/integration/Collection/ConstructCest.php

@@ -25,7 +25,7 @@ class ConstructCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/CountCest.php

@@ -30,7 +30,7 @@ class CountCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots())->getSource();

tests/integration/Collection/CreateCest.php

@@ -30,7 +30,7 @@ class CreateCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots())->getSource();

tests/integration/Collection/DeleteCest.php

@@ -32,7 +32,7 @@ class DeleteCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots)->getSource();

tests/integration/Collection/Document/AssignCest.php

@@ -25,7 +25,7 @@ class AssignCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/Document/ConstructCest.php

@@ -24,7 +24,7 @@ class ConstructCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/Document/JsonSerializeCest.php

@@ -25,7 +25,7 @@ class JsonSerializeCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/Document/OffsetArrayAccessCest.php

@@ -26,7 +26,7 @@ class OffsetArrayAccessCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/Document/ReadWriteAttributeCest.php

@@ -26,7 +26,7 @@ class ReadWriteAttributeCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/Document/ToArrayCest.php

@@ -26,7 +26,7 @@ class ToArrayCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 

tests/integration/Collection/FindByIdCest.php

@@ -33,7 +33,7 @@ class FindByIdCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots())->getSource();

tests/integration/Collection/FindCest.php

@@ -31,7 +31,7 @@ class FindCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots)->getSource();

tests/integration/Collection/FindFirstCest.php

@@ -31,7 +31,7 @@ class FindFirstCest
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
 
         $this->source = (new Robots)->getSource();

tests/integration/Collection/GetCollectionManagerCest.php → tests/integration/Collection/GetCollectionsManagerCest.php

@@ -18,29 +18,29 @@
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Mvc\Collections\Robots;
 use Phalcon\Incubator\MongoDB\Test\Fixtures\Traits\DiTrait;
 
-class GetCollectionManagerCest
+class GetCollectionsManagerCest
 {
     use DiTrait;
 
     public function _before()
     {
         $this->setNewFactoryDefault();
-        $this->setDiCollectionManager();
+        $this->setDiCollectionsManager();
         $this->setDiMongo();
     }
 
     /**
-     * Tests Phalcon\Mvc\Collection :: getCollectionManager()
+     * Tests Phalcon\Mvc\Collection :: getCollectionsManager()
      *
      * @param IntegrationTester $I
      * @since  2018-11-13
      * @author Phalcon Team <team@phalcon.io>
      */
-    public function mvcCollectionGetCollectionManager(IntegrationTester $I)
+    public function mvcCollectionGetCollectionsManager(IntegrationTester $I)
     {
-        $I->wantToTest('Mvc\Collection - getCollectionManager()');
+        $I->wantToTest('Mvc\Collection - getCollectionsManager()');
 
         $robot = new Robots();
-        $I->assertTrue(is_subclass_of($robot->getCollectionManager(), ManagerInterface::class));
+        $I->assertTrue(is_subclass_of($robot->getCollectionsManager(), ManagerInterface::class));
     }
 }