Merge lp:~tcuthbert/wordpress/openstack-objectstorage into lp:~canonical-sysadmins/wordpress/openstack-objectstorage

[Thomas Cuthbert]

Rename to SwiftObject as Object is a reserved keyword in php7

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[lp:~tcuthbert/wordpress/openstack-objectstorage]

6. By Thomas Cuthbert on 2020-05-28

Rename to SwiftObject as Object is a reserved keyword in php7

[Barry Price (barryprice)]

+1 LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 6

=== modified file 'classes/swift.php'
--- classes/swift.php	2016-01-08 13:31:09 +0000
+++ classes/swift.php	2020-05-28 05:03:43 +0000
@@ -55,7 +55,7 @@
 
 	function uploadFile( $bucket_name, $object_key, $content, $type ) {
 		$container = $this->swift_get_client()->container($bucket_name);
-		$localObject = new \OpenStack\ObjectStore\v1\Resource\Object($object_key, $content, $type);
+		$localObject = new \OpenStack\ObjectStore\v1\Resource\SwiftObject($object_key, $content, $type);
 		$container->save($localObject);
 	}
 
 
=== modified file 'src/OpenStack/ObjectStore/v1/Resource/StreamWrapper.php'
--- src/OpenStack/ObjectStore/v1/Resource/StreamWrapper.php	2015-02-11 15:35:31 +0000
+++ src/OpenStack/ObjectStore/v1/Resource/StreamWrapper.php	2020-05-28 05:03:43 +0000
@@ -845,7 +845,7 @@
 
             // For many modes, we just go ahead and create.
             if ($this->createIfNotFound) {
-                $this->obj = new Object($objectName);
+                $this->obj = new SwiftObject($objectName);
                 $this->objStream = fopen('php://temp', 'rb+');
 
                 $this->isDirty = true;
 
=== renamed file 'src/OpenStack/ObjectStore/v1/Resource/Object.php' => 'src/OpenStack/ObjectStore/v1/Resource/SwiftObject.php'
--- src/OpenStack/ObjectStore/v1/Resource/Object.php	2015-02-11 15:35:31 +0000
+++ src/OpenStack/ObjectStore/v1/Resource/SwiftObject.php	2020-05-28 05:03:43 +0000
@@ -45,7 +45,7 @@
  * Likewise, a Container instance can retrieve Object instances from the
  * remote object store.
  */
-class Object
+class SwiftObject
 {
     const DEFAULT_CONTENT_TYPE = 'application/octet-stream';