Merge pull request #3 from aliukevicius/php-7-2-fix

sausin · web-flow · commit cd3e15b20515 · 2018-02-28T18:10:24.000+01:00
Update openstack version to ^3.0
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         }
     },
     "require": {
-        "php-opencloud/openstack": "^2.0",
+        "php-opencloud/openstack": "^3.0",
         "illuminate/support": "^5.4",
         "league/flysystem": "^1.0",
         "nimbusoft/flysystem-openstack-swift": "^0.2.0",
diff --git a/tests/OVHSwiftAdapterTest.php b/tests/OVHSwiftAdapterTest.php
@@ -17,7 +17,7 @@ public function setUp()
         $this->container = Mockery::mock('OpenStack\ObjectStore\v1\Models\Container');
 
         $this->container->name = 'container-name';
-        $this->object = Mockery::mock('OpenStack\ObjectStore\v1\Models\Object');
+        $this->object = Mockery::mock('OpenStack\ObjectStore\v1\Models\StorageObject');
         $this->adapter = new OVHSwiftAdapter($this->container, $this->urlVars);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`}`
`25`	`25`	`},`
`26`	`26`	`"require": {`
`27`		`- "php-opencloud/openstack": "^2.0",`
	`27`	`+ "php-opencloud/openstack": "^3.0",`
`28`	`28`	`"illuminate/support": "^5.4",`
`29`	`29`	`"league/flysystem": "^1.0",`
`30`	`30`	`"nimbusoft/flysystem-openstack-swift": "^0.2.0",`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public function setUp()`
`17`	`17`	`$this->container = Mockery::mock('OpenStack\ObjectStore\v1\Models\Container');`
`18`	`18`
`19`	`19`	`$this->container->name = 'container-name';`
`20`		`- $this->object = Mockery::mock('OpenStack\ObjectStore\v1\Models\Object');`
	`20`	`+ $this->object = Mockery::mock('OpenStack\ObjectStore\v1\Models\StorageObject');`
`21`	`21`	`$this->adapter = new OVHSwiftAdapter($this->container, $this->urlVars);`
`22`	`22`	`}`
`23`	`23`