Merge branch 'niden-T12921-remove-session-from-di-factory' into 4.0.x

* niden-T12921-remove-session-from-di-factory: [#12921] - Changes to the changelog; corrected test [#12921] - Corrected tests [#12921] - Added issue to the changelog entry [#12921] - Updated changelog [#12921] - Removed session from DI\FactoryDefault; Minor cosmetic changes
phalcon · Dec 18, 2018 · 0fd165b · 0fd165b
2 parents 032fc59 + cc0ad96
commit 0fd165b
Show file tree

Hide file tree

Showing 25 changed files with 248 additions and 45 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -86,7 +86,10 @@
 - Renamed `Phalcon\Acl\Adapter\Memory::dropResourceAccess()` to `Phalcon\Acl\Adapter\Memory::dropSubjectAccess()` [#13639](https://github.com/phalcon/cphalcon/issues/13639) 
 - Renamed `Phalcon\Acl\Adapter\Memory::getRoless()` to `Phalcon\Acl\Adapter\Memory::getOperations()` [#13639](https://github.com/phalcon/cphalcon/issues/13639) 
 - Renamed `Phalcon\Acl\Adapter\Memory::getResources()` to `Phalcon\Acl\Adapter\Memory::getSubjects()` [#13639](https://github.com/phalcon/cphalcon/issues/13639) 
-
+- Changed `Phalcon\DI\FactoryDefault` to not load by default
+    - the `Phalcon\Session\Adapter\Files` using the name `session` 
+    - the `Phalcon\Session\Bag` using the name `sessionBag` 
+  [#12921](https://github.com/phalcon/cphalcon/issues/12921)
 ## Removed
 - PHP < 7.2 no longer supported
 - Removed `xcache` support from adapters [#13628](https://github.com/phalcon/cphalcon/pull/13628)

diff --git a/phalcon/di/factorydefault.zep b/phalcon/di/factorydefault.zep
@@ -37,27 +37,25 @@ class FactoryDefault extends \Phalcon\Di
 		parent::__construct();
 
 		let this->_services = [
-			"router":             new Service("Phalcon\\Mvc\\Router", true),
+			"annotations":        new Service("Phalcon\\Annotations\\Adapter\\Memory", true),
+			"assets":             new Service("Phalcon\\Assets\\Manager", true),
+			"crypt":              new Service("Phalcon\\Crypt", true),
+			"cookies":            new Service("Phalcon\\Http\\Response\\Cookies", true),
 			"dispatcher":         new Service("Phalcon\\Mvc\\Dispatcher", true),
-			"url":                new Service("Phalcon\\Mvc\\Url", true),
+			"escaper":            new Service("Phalcon\\Escaper", true),
+			"eventsManager":      new Service("Phalcon\\Events\\Manager", true),
+			"flash":              new Service("Phalcon\\Flash\\Direct", true),
+			"flashSession":       new Service("Phalcon\\Flash\\Session", true),
+			"filter":             new Service("Phalcon\\Filter", true),
 			"modelsManager":      new Service("Phalcon\\Mvc\\Model\\Manager", true),
 			"modelsMetadata":     new Service("Phalcon\\Mvc\\Model\\MetaData\\Memory", true),
-			"response":           new Service("Phalcon\\Http\\Response", true),
-			"cookies":            new Service("Phalcon\\Http\\Response\\Cookies", true),
 			"request":            new Service("Phalcon\\Http\\Request", true),
-			"filter":             new Service("Phalcon\\Filter", true),
-			"escaper":            new Service("Phalcon\\Escaper", true),
+			"response":           new Service("Phalcon\\Http\\Response", true),
+			"router":             new Service("Phalcon\\Mvc\\Router", true),
 			"security":           new Service("Phalcon\\Security", true),
-			"crypt":              new Service("Phalcon\\Crypt", true),
-			"annotations":        new Service("Phalcon\\Annotations\\Adapter\\Memory", true),
-			"flash":              new Service("Phalcon\\Flash\\Direct", true),
-			"flashSession":       new Service("Phalcon\\Flash\\Session", true),
 			"tag":                new Service("Phalcon\\Tag", true),
-			"session":            new Service("Phalcon\\Session\\Adapter\\Files", true),
-			"sessionBag":         new Service("Phalcon\\Session\\Bag"),
-			"eventsManager":      new Service("Phalcon\\Events\\Manager", true),
 			"transactionManager": new Service("Phalcon\\Mvc\\Model\\Transaction\\Manager", true),
-			"assets":             new Service("Phalcon\\Assets\\Manager", true)
+			"url":                new Service("Phalcon\\Mvc\\Url", true)
 		];
 	}
 }
diff --git a/phalcon/di/factorydefault/cli.zep b/phalcon/di/factorydefault/cli.zep
@@ -41,15 +41,15 @@ class Cli extends FactoryDefault
 		parent::__construct();
 
 		let this->_services = [
-			"router":             new Service("Phalcon\\Cli\\Router", true),
+			"annotations":        new Service("Phalcon\\Annotations\\Adapter\\Memory", true),
 			"dispatcher":         new Service("Phalcon\\Cli\\Dispatcher", true),
+			"escaper":            new Service("Phalcon\\Escaper", true),
+			"eventsManager":      new Service("Phalcon\\Events\\Manager", true),
+			"filter":             new Service("Phalcon\\Filter", true),
 			"modelsManager":      new Service("Phalcon\\Mvc\\Model\\Manager", true),
 			"modelsMetadata":     new Service("Phalcon\\Mvc\\Model\\MetaData\\Memory", true),
-			"filter":             new Service("Phalcon\\Filter", true),
-			"escaper":            new Service("Phalcon\\Escaper", true),
-			"annotations":        new Service("Phalcon\\Annotations\\Adapter\\Memory", true),
+			"router":             new Service("Phalcon\\Cli\\Router", true),
 			"security":           new Service("Phalcon\\Security", true),
-			"eventsManager":      new Service("Phalcon\\Events\\Manager", true),
 			"transactionManager": new Service("Phalcon\\Mvc\\Model\\Transaction\\Manager", true)
 		];
 	}

diff --git a/tests/_data/fixtures/Traits/SessionBagTrait.php b/tests/_data/fixtures/Traits/SessionBagTrait.php
@@ -0,0 +1,46 @@
+<?php
+declare(strict_types=1);
+
+/**
+ * This file is part of the Phalcon Framework.
+ *
+ * (c) Phalcon Team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE.txt
+ * file that was distributed with this source code.
+ */
+
+namespace Phalcon\Test\Fixtures\Traits;
+
+use Phalcon\Logger;
+use Phalcon\Logger\Adapter\Stream;
+use Phalcon\Logger\Exception;
+use UnitTester;
+use function outputFolder;
+
+/**
+ * Trait SessionBagTrait
+ *
+ * @package Phalcon\Test\Fixtures\Traits
+ */
+trait SessionBagTrait
+{
+    /**
+     * @param UnitTester $I
+     */
+    public function _before(UnitTester $I)
+    {
+        $this->setNewFactoryDefault();
+        $this->setDiSession();
+    }
+
+    /**
+     * @return mixed
+     */
+    abstract protected function setNewFactoryDefault();
+
+    /**
+     * @return mixed
+     */
+    abstract protected function setDiSession();
+}
diff --git a/tests/integration/Session/Bag/ConstructCest.php b/tests/integration/Session/Bag/ConstructCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -12,7 +13,11 @@
 namespace Phalcon\Test\Integration\Session\Bag;
 
 use IntegrationTester;
+use Phalcon\Session\Bag;
 
+/**
+ * Class ConstructCest
+ */
 class ConstructCest
 {
     /**
@@ -26,7 +31,7 @@ class ConstructCest
     public function sessionBagConstruct(IntegrationTester $I)
     {
         $I->wantToTest("Session\Bag - __construct()");
-        $session = new \Phalcon\Session\Bag("test");
+        $session = new Bag("test");
         $I->assertInstanceOf("\Phalcon\Session\Bag", $session);
     }
 }
diff --git a/tests/integration/Session/Bag/CountCest.php b/tests/integration/Session/Bag/CountCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -12,9 +13,18 @@
 namespace Phalcon\Test\Integration\Session\Bag;
 
 use IntegrationTester;
+use Phalcon\Session\Bag;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
 
+/**
+ * Class CountCest
+ */
 class CountCest
 {
+    use DiTrait;
+    use SessionBagTrait;
+
     /**
      * Tests Phalcon\Session\Bag :: count()
      *
@@ -26,7 +36,7 @@ class CountCest
     public function sessionBagCount(IntegrationTester $I)
     {
         $I->wantToTest("Session\Bag - count()");
-        $session = new \Phalcon\Session\Bag("CountTest");
+        $session        = new Bag("CountTest");
         $session->test1 = "test";
         $session->test2 = "test";
         $session->test3 = "test";

diff --git a/tests/integration/Session/Bag/DestroyCest.php b/tests/integration/Session/Bag/DestroyCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -12,9 +13,18 @@
 namespace Phalcon\Test\Integration\Session\Bag;
 
 use IntegrationTester;
+use Phalcon\Session\Bag;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
 
+/**
+ * Class DestroyCest
+ */
 class DestroyCest
 {
+    use DiTrait;
+    use SessionBagTrait;
+
     /**
      * Tests Phalcon\Session\Bag :: destroy()
      *
@@ -26,12 +36,12 @@ class DestroyCest
     public function sessionBagDestroy(IntegrationTester $I)
     {
         $I->wantToTest("Session\Bag - destroy()");
-        $session = new \Phalcon\Session\Bag("DestroyTest");
+        $session = new Bag("DestroyTest");
         // test using magic setter
         $session->test = "test";
         $session->destroy();
 
-        $session = new \Phalcon\Session\Bag("DestroyTest");
+        $session = new Bag("DestroyTest");
         $I->assertEquals(null, $session->test);
     }
 }
diff --git a/tests/integration/Session/Bag/GetCest.php b/tests/integration/Session/Bag/GetCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -12,9 +13,18 @@
 namespace Phalcon\Test\Integration\Session\Bag;
 
 use IntegrationTester;
+use Phalcon\Session\Bag;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
 
+/**
+ * Class GetCest
+ */
 class GetCest
 {
+    use DiTrait;
+    use SessionBagTrait;
+
     /**
      * Tests Phalcon\Session\Bag :: get()
      *
@@ -26,7 +36,7 @@ class GetCest
     public function sessionBagGet(IntegrationTester $I)
     {
         $I->wantToTest("Session\Bag - get()");
-        $session = new \Phalcon\Session\Bag("SetTest");
+        $session = new Bag("SetTest");
 
         $testValue = "TestValue";
         $session->set("test", $testValue);

diff --git a/tests/integration/Session/Bag/GetDICest.php b/tests/integration/Session/Bag/GetDICest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -12,9 +13,19 @@
 namespace Phalcon\Test\Integration\Session\Bag;
 
 use IntegrationTester;
+use Phalcon\Di\FactoryDefault;
+use Phalcon\Session\Bag;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
 
+/**
+ * Class GetDICest
+ */
 class GetDICest
 {
+    use DiTrait;
+    use SessionBagTrait;
+
     /**
      * Tests Phalcon\Session\Bag :: getDI()
      *
@@ -26,8 +37,8 @@ class GetDICest
     public function sessionBagGetDI(IntegrationTester $I)
     {
         $I->wantToTest("Session\Bag - getDI()");
-        $session = new \Phalcon\Session\Bag("DiTest");
-        $di = new \Phalcon\Di\FactoryDefault();
+        $session = new Bag("DiTest");
+        $di      = new FactoryDefault();
         $session->setDI($di);
         $I->assertEquals($di, $session->getDI());
     }

diff --git a/tests/integration/Session/Bag/GetIteratorCest.php b/tests/integration/Session/Bag/GetIteratorCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -12,9 +13,18 @@
 namespace Phalcon\Test\Integration\Session\Bag;
 
 use IntegrationTester;
+use Phalcon\Session\Bag;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
 
+/**
+ * Class GetIteratorCest
+ */
 class GetIteratorCest
 {
+    use DiTrait;
+    use SessionBagTrait;
+
     /**
      * Tests Phalcon\Session\Bag :: getIterator()
      *
@@ -26,7 +36,7 @@ class GetIteratorCest
     public function sessionBagGetIterator(IntegrationTester $I)
     {
         $I->wantToTest("Session\Bag - getIterator()");
-        $session = new \Phalcon\Session\Bag("CountTest");
+        $session        = new Bag("CountTest");
         $session->test1 = "test";
         $session->test2 = "test";
         $session->test3 = "test";

diff --git a/tests/integration/Session/Bag/HasCest.php b/tests/integration/Session/Bag/HasCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -12,9 +13,18 @@
 namespace Phalcon\Test\Integration\Session\Bag;
 
 use IntegrationTester;
+use Phalcon\Session\Bag;
+use Phalcon\Test\Fixtures\Traits\DiTrait;
+use Phalcon\Test\Fixtures\Traits\SessionBagTrait;
 
+/**
+ * Class HasCest
+ */
 class HasCest
 {
+    use DiTrait;
+    use SessionBagTrait;
+
     /**
      * Tests Phalcon\Session\Bag :: has()
      *
@@ -26,7 +36,7 @@ class HasCest
     public function sessionBagHas(IntegrationTester $I)
     {
         $I->wantToTest("Session\Bag - has()");
-        $session = new \Phalcon\Session\Bag("SetTest");
+        $session = new Bag("SetTest");
 
         $testValue = "TestValue";
         $session->set("test", $testValue);

diff --git a/tests/integration/Session/Bag/InitializeCest.php b/tests/integration/Session/Bag/InitializeCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -13,6 +14,9 @@
 
 use IntegrationTester;
 
+/**
+ * Class InitializeCest
+ */
 class InitializeCest
 {
     /**

diff --git a/tests/integration/Session/Bag/OffsetExistsCest.php b/tests/integration/Session/Bag/OffsetExistsCest.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * This file is part of the Phalcon Framework.
@@ -13,6 +14,9 @@
 
 use IntegrationTester;
 
+/**
+ * Class OffsetExistsCest
+ */
 class OffsetExistsCest
 {
     /**