Revert "Merge pull request silverstripe#33 from open-sausages/fix/ses…

…sion-binary-safety" This reverts commit 793f933, reversing changes made to 785c697.
open-sausages · Jul 11, 2019 · 8ef4497 · 8ef4497
1 parent c4b8322
commit 8ef4497
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 128 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,11 +9,11 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.1
-      env: DB=MYSQL PHPUNIT_TEST=1
-    - php: 7.2
+    - php: 5.6
       env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
-    - php: 7.3
+    - php: 7.0
+      env: DB=MYSQL PHPUNIT_TEST=1
+    - php: 7.1
       env: DB=MYSQL PHPUNIT_TEST=1
 
 before_script:

diff --git a/code/DynamoDbClient.php b/code/DynamoDbClient.php
diff --git a/code/Model/DynamoDbSession.php b/code/Model/DynamoDbSession.php
@@ -2,8 +2,8 @@
 
 namespace SilverStripe\DynamoDb\Model;
 
-use SilverStripe\DynamoDb\DynamoDbClient;
-use SilverStripe\DynamoDb\SessionHandler;
+use Aws\DynamoDb\DynamoDbClient;
+use Aws\DynamoDb\SessionHandler;
 use Aws\DoctrineCacheAdapter;
 use Doctrine\Common\Cache\ApcuCache;
 use SilverStripe\Core\Config\Config;
@@ -78,8 +78,7 @@ public static function get()
 
     public function __construct($options, $table)
     {
-        $this->client = new DynamoDbClient($table, array_merge(['version' => '2012-08-10'], $options));
-
+        $this->client = new DynamoDbClient(array_merge(['version' => '2012-08-10'], $options));
         $this->table = $table;
         $this->handler = SessionHandler::fromClient(
             $this->client,

diff --git a/code/SessionHandler.php b/code/SessionHandler.php
diff --git a/composer.json b/composer.json
@@ -21,8 +21,7 @@
 		"silverstripe/framework": "^4@dev"
 	},
 	"require-dev": {
-		"phpunit/PHPUnit": "^5.7",
-		"squizlabs/php_codesniffer": "^3.0"
+		"phpunit/PHPUnit": "^5.7"
 	},
 	"autoload": {
     "psr-4": {