update composer deps

apioo · Mar 30, 2016 · 55f1fff · 55f1fff
1 parent 01e880d
commit 55f1fff
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/library/PSX/Data/composer.json b/library/PSX/Data/composer.json
@@ -17,7 +17,6 @@
     "psx/validate": "^2.0",
     "psx/json": "^2.0",
     "psx/http": "^2.0",
-    "psx/uri": "^2.0",
     "psx/model": "^2.0",
     "psx/datetime": "^2.0",
     "psr/cache": "^1.0",

diff --git a/library/PSX/DateTime/composer.json b/library/PSX/DateTime/composer.json
@@ -12,7 +12,7 @@
     }
   ],
   "require": {
-    "php": ">=5.4"
+    "php": ">=5.5"
   },
   "autoload": {
     "psr-4": {

diff --git a/library/PSX/Framework/composer.json b/library/PSX/Framework/composer.json
@@ -18,8 +18,13 @@
     "jms/serializer": "^1.1",
     "monolog/monolog": "^1.17",
     "psr/log": "^1.0",
+    "psx/api": "^2.0",
+    "psx/cache": "^2.0",
     "psx/data": "^2.0",
+    "psx/http": "^2.0",
     "psx/schema": "^2.0",
+    "psx/sql": "^2.0",
+    "psx/validate": "^2.0",
     "symfony/console": "^2.8",
     "symfony/dependency-injection": "^2.8",
     "symfony/event-dispatcher": "^2.8"

diff --git a/library/PSX/Http/Cookie.php b/library/PSX/Http/Cookie.php
@@ -21,7 +21,6 @@
 namespace PSX\Http;
 
 use InvalidArgumentException;
-use PSX\DateTime\DateTime;
 
 /**
  * Cookie
@@ -97,7 +96,7 @@ public function toString()
         );
 
         if ($this->expires !== null) {
-            $parameters['Expires'] = $this->expires->format(DateTime::HTTP);
+            $parameters['Expires'] = $this->expires->format('D, d M Y H:i:s \G\M\T');
         }
 
         if (!empty($this->path)) {

diff --git a/library/PSX/Http/composer.json b/library/PSX/Http/composer.json
@@ -14,7 +14,6 @@
   "require": {
     "php": ">=5.5",
     "psx/uri": "^2.0",
-    "psx/datetime": "^2.0",
     "psr/http-message": "^1.0",
     "zendframework/zend-diactoros": "^1.3"
   },

diff --git a/library/PSX/Json/composer.json b/library/PSX/Json/composer.json
@@ -12,7 +12,8 @@
     }
   ],
   "require": {
-    "php": ">=5.5"
+    "php": ">=5.5",
+    "psx/data": "^2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/library/PSX/Model/composer.json b/library/PSX/Model/composer.json
@@ -12,7 +12,8 @@
     }
   ],
   "require": {
-    "php": ">=5.5"
+    "php": ">=5.5",
+    "psx/data": "^2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/library/PSX/Oauth/composer.json b/library/PSX/Oauth/composer.json
@@ -12,7 +12,8 @@
     }
   ],
   "require": {
-    "php": ">=5.5"
+    "php": ">=5.5",
+    "psx/framework": "^2.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/library/PSX/Oauth2/composer.json b/library/PSX/Oauth2/composer.json
@@ -12,7 +12,8 @@
     }
   ],
   "require": {
-    "php": ">=5.5"
+    "php": ">=5.5",
+    "psx/framework": "^2.0"
   },
   "autoload": {
     "psr-4": {