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

[Thomas Cuthbert]

Rename missing 'Object' references to new 'SwiftObject' name

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

[Stephen Muss (stephenmuss)]

lgtm

review: Approve

[Canonical IS Mergebot (canonical-is-mergebot)]

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

[Canonical IS Mergebot (canonical-is-mergebot)]

Change must be approved by a member of one of the following teams:
Setting status to needs review.

[Canonical IS Mergebot (canonical-is-mergebot)]

Change must be approved by a member of one of the following teams:
Setting status to needs review.

[Canonical IS Mergebot (canonical-is-mergebot)]

Change successfully merged at revision 7

=== modified file 'src/OpenStack/ObjectStore/v1/Resource/Container.php'
--- src/OpenStack/ObjectStore/v1/Resource/Container.php	2015-02-11 15:35:31 +0000
+++ src/OpenStack/ObjectStore/v1/Resource/Container.php	2020-07-03 05:41:30 +0000
@@ -451,7 +451,7 @@
      * @throws \OpenStack\Common\Exception                                        when an unexpected (usually
      *                                                                            network-related) error condition arises.
      */
-    public function save(Object $obj, $file = null)
+    public function save(SwiftObject $obj, $file = null)
     {
         if (empty($this->token)) {
             throw new Exception('Container does not have an auth token.');
@@ -555,7 +555,7 @@
      * @throws \OpenStack\Common\Transport\Exception\ResourceNotFoundException if the object does not already
      *                                                           exist on the object storage.
      */
-    public function updateMetadata(Object $obj)
+    public function updateMetadata(SwiftObject $obj)
     {
         $url = self::objectUrl($this->url, $obj->name());
         $headers = ['X-Auth-Token' => $this->token];
@@ -607,7 +607,7 @@
      *                          set, the object will be saved into this container. If this is not sent,
      *                          the copy will be performed inside of the original container.
      */
-    public function copy(Object $obj, $newName, $container = null)
+    public function copy(SwiftObject $obj, $newName, $container = null)
     {
         $sourceUrl = self::objectUrl($this->url, $obj->name());