Fix/ttl mode on windows

common/persistence/class.PhpFileDriver.php

@@ -202,8 +202,11 @@ private function writeFile($id, $value, $preWriteValueProcessor = null)
     public function get($id)
     {
         $entry = $this->readFile($id);
-        if ($entry != false && $this->isTtlMode()) {
-            $entry = (is_null($entry[static::ENTRY_EXPIRATION]) || $entry[static::ENTRY_EXPIRATION] > $this->getTime())
+
+        if ($entry !== false && $this->isTtlMode()) {
+            $entry = isset($entry)
+                    && array_key_exists(static::ENTRY_EXPIRATION, $entry)
+                    && (is_null($entry[static::ENTRY_EXPIRATION]) || $entry[static::ENTRY_EXPIRATION] > $this->getTime())
                 ? $entry[static::ENTRY_VALUE]
                 : false
             ;
@@ -352,7 +355,7 @@ public function purge()
     }
 
     /**
-     * Map the provided key to a relativ path
+     * Map the provided key to a relative path
      * 
      * @param string $key
      * @return string

manifest.php

@@ -31,7 +31,7 @@
     'label' => 'Generis Core',
     'description' => 'Core extension, provide the low level framework and an API to manage ontologies',
     'license' => 'GPL-2.0',
-    'version' => '7.9.10',
+    'version' => '7.9.11',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(),
     'models' => array(

scripts/update/Updater.php

@@ -330,6 +330,6 @@ public function update($initialVersion) {
             $this->setVersion('7.2.0');
         }
 
-        $this->skip('7.2.0', '7.9.10');
+        $this->skip('7.2.0', '7.9.11');
     }
 }

test/integration/common/PhpFileDriverTest.php

@@ -0,0 +1,84 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; under version 2
+ * of the License (non-upgradable).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (c) 2018  (original work) Open Assessment Technologies SA;
+ *
+ * @author Alexander Zagovorichev <[email protected]>
+ */
+
+class PhpFileDriverTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @var common_persistence_PhpFileDriver
+     */
+    private $driver;
+
+    protected function setUp()
+    {
+        $this->driver = new common_persistence_PhpFileDriver();
+    }
+
+    public function testGetFalse()
+    {
+        self::assertFalse($this->driver->get(false));
+        self::assertFalse($this->driver->get(null));
+        self::assertFalse($this->driver->get(''));
+        self::assertFalse($this->driver->get('not existent'));
+    }
+
+    public function testGet()
+    {
+        $this->driver->connect(false, [
+            'dir' => __DIR__ . '/samples/',
+            'humanReadable' => true,
+        ]);
+        self::assertEquals('content is here', $this->driver->get('test'));
+    }
+
+    public function testTtlMode()
+    {
+        $this->driver->connect(false, [
+            'dir' => __DIR__ . '/samples/',
+            'humanReadable' => true,
+            'ttlMode' => true,
+        ]);
+        self::assertEquals('Sword', $this->driver->get('testTtl'));
+    }
+
+    public function ttlFalseDataProvider ()
+    {
+        return [
+            ['testTtlEmpty'],
+            ['testTtlNull'],
+            ['testTtlNoExpires'],
+            ['testTtlExpired'],
+        ];
+    }
+
+    /**
+     * @dataProvider ttlFalseDataProvider
+     */
+    public function testFalseTtl($id)
+    {
+        $this->driver->connect(false, [
+            'dir' => __DIR__ . '/samples/',
+            'humanReadable' => true,
+            'ttlMode' => true,
+        ]);
+        self::assertFalse($this->driver->get($id));
+    }
+
+}

test/integration/common/samples/test.php

@@ -0,0 +1,2 @@
+<?php
+    return 'content is here';

test/integration/common/samples/testTtl.php

@@ -0,0 +1,5 @@
+<?php
+    return [
+        'expiresAt' => time() + 1000,
+        'value' => 'Sword',
+    ];

test/integration/common/samples/testTtlEmpty.php

@@ -0,0 +1,2 @@
+<?php
+    return [];

test/integration/common/samples/testTtlExpired.php

@@ -0,0 +1,5 @@
+<?php
+    return [
+        'expiresAt' => time() - 1000,
+        'value' => 'Sword',
+    ];

test/integration/common/samples/testTtlNoExpires.php

@@ -0,0 +1,4 @@
+<?php
+    return [
+        'value' => 'Sword',
+    ];

test/integration/common/samples/testTtlNull.php

@@ -0,0 +1,2 @@
+<?php
+    return null;