multiple fixes to namespaces

fixes to interface-compatibility

Author: Idrinth

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "idrinth/php-memcached-session",
+    "name": "Yet-Another-Web-Stack/php-memcached-session",
     "description": "Provides a sessionhandler for php and memcached",
     "license": "MIT",
     "type": "library",

src/Controller/Session.php

@@ -2,7 +2,13 @@
 
 namespace YetAnotherWebStack\PhpMemcachedSession\Controller;
 
-class Session implements YetAnotherWebStack\PhpMemcachedSession\Interfaces\Controller {
+class Session implements \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Controller {
+
+    /**
+     *
+     * @var string
+     */
+    protected static $model = 'YetAnotherWebStack\PhpMemcachedSession\Interfaces\Model';
 
     /**
      *
@@ -55,8 +61,7 @@ public function create_sid() {
     public function destroy($session_id) {
         $this->logger->debug("Destroying session");
         return \YetAnotherWebStack\PhpMemcachedSession\Service\DependencyInjector::get(
-                        'YetAnotherWebStack\PhpMemcachedSession\Interfaces\Model',
-                        [':sessionId' => $session_id])->delete();
+                        self::$model, [':sessionId' => $session_id])->delete();
     }
 
     /**
@@ -88,8 +93,7 @@ public function open($save_path, $name) {
     public function read($session_id) {
         $this->logger->debug("Trying read session $session_id");
         return \YetAnotherWebStack\PhpMemcachedSession\Service\DependencyInjector::get(
-                        'YetAnotherWebStack\PhpMemcachedSession\Interfaces\Model',
-                        ['sessionId' => $session_id])->load();
+                        self::$model, [':sessionId' => $session_id])->load();
     }
 
     /**
@@ -101,8 +105,7 @@ public function read($session_id) {
     public function write($session_id, $session_data) {
         $this->logger->debug("Trying write to the session $session_id");
         return \YetAnotherWebStack\PhpMemcachedSession\Service\DependencyInjector::get(
-                        'YetAnotherWebStack\PhpMemcachedSession\Interfaces\Model',
-                        ['sessionId' => $session_id])->save($session_data);
+                        self::$model, [':sessionId' => $session_id])->save($session_data);
     }
 
 }

src/Interfaces/Configuration.php

@@ -9,28 +9,28 @@ interface Configuration {
      * @param string $key
      * @return mixed
      */
-    public function getGeneral(string $key);
+    public function getGeneral($key);
 
     /**
      *
      * @param string $key
      * @return mixed
      */
-    public function getSpecific(string $key);
+    public function getSpecific($key);
 
     /**
      *
      * @param string $key
      * @param mixed $value
      * @return mixed
      */
-    public function setGeneral(string $key, $value);
+    public function setGeneral($key, $value);
 
     /**
      *
      * @param string $key
      * @param mixed $value
      * @return mixed
      */
-    public function setSpecific(string $key, $value);
+    public function setSpecific($key, $value);
 }

src/Interfaces/Model.php

@@ -9,8 +9,9 @@ interface Model {
      * @param string $sessionId
      * @param \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Repository $repository
      */
-    public function __construct(string $sessionId,
-            \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Repository $repository);
+    public function __construct($sessionId,
+            \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Repository $repository,
+            \Psr\Log\LoggerInterface $logger);
 
     /**
      *
@@ -23,7 +24,7 @@ public function load();
      * @param string $data
      * @return boolean was it saved?
      */
-    public function save(string $data);
+    public function save($data);
 
     /**
      * deletes the current data and instance

src/Interfaces/Repository.php

@@ -17,7 +17,7 @@ public function getByKey(array $params);
      * @param string $value
      * @return boolean
      */
-    public function setByKey(array $params, string $value);
+    public function setByKey(array $params, $value);
 
     /**
      *

src/Model/Session.php

@@ -2,7 +2,7 @@
 
 namespace YetAnotherWebStack\PhpMemcachedSession\Model;
 
-class Session implements YetAnotherWebStack\PhpMemcachedSession\Interfaces\Model {
+class Session implements \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Model {
 
     /**
      *
@@ -40,12 +40,18 @@ class Session implements YetAnotherWebStack\PhpMemcachedSession\Interfaces\Model
      */
     protected $logger;
 
+    /**
+     *
+     * @var boolean
+     */
+    protected $wasStored = false;
+
     /**
      *
      * @param string $sessionId
      * @param \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Repository $repository
      */
-    protected function __construct($sessionId,
+    public function __construct($sessionId,
             \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Repository $repository,
             \Psr\Log\LoggerInterface $logger) {
         $this->logger = $logger;
@@ -67,7 +73,7 @@ protected function getKeys() {
     /**
      * stores the sessionId
      */
-    protected function __destruct() {
+    public function __destruct() {
         $this->save(serialize($_SESSION));
         $this->logger->debug("Saved session");
     }
@@ -77,7 +83,7 @@ protected function __destruct() {
      * @return string a serialized string
      */
     public function load() {
-        $this->original = $this->getByKey($this->getKeys()) . '';
+        $this->original = $this->repository->getByKey($this->getKeys()) . '';
         $this->logger->debug("Loading session");
         return $this->original;
     }
@@ -88,12 +94,17 @@ public function load() {
      * @return boolean was it saved?
      */
     public function save($data) {
+        if ($this->wasStored) {
+            $this->logger->debug("Already saved, nothing to store");
+            return;
+        }
+        $this->wasStored;
         if ($data === $this->original) {
             $this->logger->debug("Session unchanged, nothing to store");
             return true; //nothing to change
         }
         $this->logger->debug("Session changed, storing");
-        return $this->repository->updateByKey($this->getKeys(), $data);
+        return $this->repository->setByKey($this->getKeys(), $data);
     }
 
     /**

src/Repository/MemCacheRead.php

@@ -57,7 +57,8 @@ public function __construct(\Memcached $memcache,
      * add login data if provided
      */
     protected function setMemcacheLogin() {
-        if ($this->configuration->getSpecific('memcache_user') && $this->configuration->getSpecific('memcache_password')) {
+        if ($this->configuration->getSpecific('memcache_user') &&
+                $this->configuration->getSpecific('memcache_password')) {
             $this->memcache->setSaslAuthData(
                     $this->configuration->getSpecific('memcache_user'),
                     $this->configuration->getSpecific('memcache_password')

src/Service/Configuration.php

@@ -2,7 +2,7 @@
 
 namespace YetAnotherWebStack\PhpMemcachedSession\Service;
 
-class Configuration {
+class Configuration implements \YetAnotherWebStack\PhpMemcachedSession\Interfaces\Configuration {
 
     /**
      *
@@ -36,7 +36,7 @@ public function getGeneral($key) {
      */
     public function getSpecific($key) {
         $value = ini_get(self::$iniPrefix . '.' . $key);
-        if ($value === null && !isset(self::$defaults[$key])) {
+        if (!$value && !isset(self::$defaults[$key])) {
             return null;
         }
         return self::$defaults[$key];

src/Service/DependencyInjector.php

@@ -14,7 +14,7 @@ class DependencyInjector {
      * param string $interface
      * @return \stdClass
      */
-    public static function get($interface, $arguments) {
+    public static function get($interface, $arguments = array()) {
         if (!self::$instance) {
             self::$instance = new \Auryn\Injector();
         }