Merge branch 'peter279k-master'

Author: josantonius

composer.json

@@ -55,7 +55,7 @@
         "phpmd": "vendor/bin/phpmd src,tests text ./phpmd.xml",
         "fix": [
             "vendor/bin/php-cs-fixer fix -v",
-            "vendor/bin/phpcbf src,tests"
+            "vendor/bin/phpcbf src tests"
         ],
         "tests": [
             "clear",

src/Session.php

@@ -50,6 +50,18 @@ public static function setPrefix($prefix)
         return is_string(self::$prefix = $prefix);
     }
 
+    /**
+     * Get prefix for sessions.
+     *
+     * @since 1.0.0
+     *
+     * @return string
+     */
+    public static function getPrefix()
+    {
+        return self::$prefix;
+    }
+
     /**
      * If session has not started, start sessions.
      *

tests/SessionTest.php

@@ -48,6 +48,7 @@ public function setUp()
     public function testIsInstanceOfSession()
     {
         $actual = $this->Session;
+
         $this->assertInstanceOf('Josantonius\Session\Session', $actual);
     }
 
@@ -58,7 +59,22 @@ public function testIsInstanceOfSession()
      */
     public function testSetPrefix()
     {
-        $this->assertTrue($this->Session->setPrefix('ses_'));
+        $session = $this->Session;
+
+        $this->assertTrue($session::setPrefix('ses_'));
+    }
+
+    /**
+     * Get prefix for sessions.
+     *
+     * @since 1.1.3
+     */
+    public function testGetPrefix()
+    {
+        $session = $this->Session;
+        $session::setPrefix('ses_');
+
+        $this->assertSame('ses_', $session::getPrefix());
     }
 
     /**
@@ -70,7 +86,10 @@ public function testSetPrefix()
      */
     public function testInit()
     {
-        $this->assertTrue($this->Session->init());
+        $session = $this->Session;
+
+        $this->assertTrue($session::init());
+        $this->assertFalse($session::init());
     }
 
     /**
@@ -80,7 +99,9 @@ public function testInit()
      */
     public function testSet()
     {
-        $this->assertTrue($this->Session->set('name', 'Joseph'));
+        $session = $this->Session;
+
+        $this->assertTrue($session::set('name', 'Joseph'));
     }
 
     /**
@@ -90,13 +111,14 @@ public function testSet()
      */
     public function testSetMultiple()
     {
+        $session = $this->Session;
         $data = [
             'name' => 'Joseph',
             'age' => '28',
             'business' => ['name' => 'Company'],
         ];
 
-        $this->assertTrue($this->Session->set($data));
+        $this->assertTrue($session::set($data));
     }
 
     /**
@@ -106,7 +128,9 @@ public function testSetMultiple()
      */
     public function testPull()
     {
-        $this->assertContains('28', $this->Session->pull('age'));
+        $session = $this->Session;
+
+        $this->assertContains('28', $session::pull('age'));
     }
 
     /**
@@ -116,7 +140,9 @@ public function testPull()
      */
     public function testPullNonExistent()
     {
-        $this->assertNull($this->Session->pull('???'));
+        $session = $this->Session;
+
+        $this->assertNull($session::pull('???'));
     }
 
     /**
@@ -126,7 +152,9 @@ public function testPullNonExistent()
      */
     public function testGet()
     {
-        $this->assertContains('Joseph', $this->Session->get('name'));
+        $session = $this->Session;
+
+        $this->assertContains('Joseph', $session::get('name'));
     }
 
     /**
@@ -136,7 +164,9 @@ public function testGet()
      */
     public function testGetNonExistent()
     {
-        $this->assertNull($this->Session->get('age'));
+        $session = $this->Session;
+
+        $this->assertNull($session::get('age'));
     }
 
     /**
@@ -146,7 +176,9 @@ public function testGetNonExistent()
      */
     public function testGetWithSecondKey()
     {
-        $this->assertContains('Company', $this->Session->get('business', 'name'));
+        $session = $this->Session;
+
+        $this->assertContains('Company', $session::get('business', 'name'));
     }
 
     /**
@@ -156,7 +188,9 @@ public function testGetWithSecondKey()
      */
     public function testGetWithSecondKeyNonExistent()
     {
-        $this->assertNull($this->Session->get('???', '???'));
+        $session = $this->Session;
+
+        $this->assertNull($session::get('???', '???'));
     }
 
     /**
@@ -166,7 +200,9 @@ public function testGetWithSecondKeyNonExistent()
      */
     public function testGetAll()
     {
-        $this->assertInternalType('array', $this->Session->get());
+        $session = $this->Session;
+
+        $this->assertInternalType('array', $session::get());
     }
 
     /**
@@ -176,7 +212,9 @@ public function testGetAll()
      */
     public function testId()
     {
-        $this->assertInternalType('string', $this->Session->id());
+        $session = $this->Session;
+
+        $this->assertInternalType('string', $session::id());
     }
 
     /**
@@ -188,9 +226,11 @@ public function testId()
      */
     public function testRegenerate()
     {
-        $this->assertTrue($this->Session->init());
+        $session = $this->Session;
+
+        $this->assertTrue($session::init());
 
-        $this->assertInternalType('string', $this->Session->regenerate());
+        $this->assertInternalType('string', $session::regenerate());
     }
 
     /**
@@ -202,13 +242,15 @@ public function testRegenerate()
      */
     public function testValidateRegenerateId()
     {
-        $this->assertTrue($this->Session->init());
+        $session = $this->Session;
+
+        $this->assertTrue($session::init());
 
-        $actualID = $this->Session->id();
+        $actualID = $session::id();
 
         $this->assertInternalType('string', $actualID);
 
-        $newID = $this->Session->regenerate();
+        $newID = $session::regenerate();
 
         $this->assertInternalType('string', $newID);
 
@@ -224,18 +266,24 @@ public function testValidateRegenerateId()
      */
     public function testDestroy()
     {
-        $this->assertTrue($this->Session->init());
+        $session = $this->Session;
+
+        $this->assertTrue($session::init());
+
+        $this->assertTrue($session::set('name', 'Joseph'));
+
+        $this->assertContains('Joseph', $session::get('name'));
 
-        $this->assertTrue($this->Session->set('name', 'Joseph'));
+        $this->assertTrue($session::destroy('name'));
 
-        $this->assertContains('Joseph', $this->Session->get('name'));
+        $this->assertNull($session::get('name'));
 
-        $this->assertTrue($this->Session->destroy('name'));
+        $this->assertTrue($session::destroy('ses_', true));
 
-        $this->assertNull($this->Session->get('name'));
+        $this->assertTrue($session::set('name', 'Joseph'));
 
-        $this->assertTrue($this->Session->destroy('ses_', true));
+        $this->assertTrue($session::destroy('name', true));
 
-        $this->assertTrue($this->Session->destroy());
+        $this->assertTrue($session::destroy());
     }
 }