Fix PSR-7 v2.0 compatibility for systems shipping psr/http-message 2.0

classes/admin_settings_aws_region.php

@@ -37,15 +37,14 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class admin_settings_aws_region extends \admin_setting_configtext {
-
     /**
      * Return part of form with setting.
      *
      * @param mixed $data array or string depending on setting
      * @param string $query
      * @return string
      */
-    public function output_html($data, $query='') {
+    public function output_html($data, $query = '') {
         global $CFG;
 
         $default = $this->get_defaultsetting();
@@ -63,21 +62,21 @@ public function output_html($data, $query='') {
             }
         }
 
-        $inputparams = array(
+        $inputparams = [
             'type' => 'text',
             'list' => $this->get_full_name(),
             'name' => $this->get_full_name(),
             'value' => $data,
             'size' => $this->size,
             'id' => $this->get_id(),
             'class' => 'form-control text-ltr',
-        );
+        ];
 
-        $element = \html_writer::start_tag('div', array('class' => 'form-text defaultsnext'));
+        $element = \html_writer::start_tag('div', ['class' => 'form-text defaultsnext']);
         $element .= \html_writer::empty_tag('input', $inputparams);
-        $element .= \html_writer::start_tag('datalist', array('id' => $this->get_full_name()));
+        $element .= \html_writer::start_tag('datalist', ['id' => $this->get_full_name()]);
         foreach ($options as $option) {
-            $element .= \html_writer::tag('option', $option['label'], array('value' => $option['value']));
+            $element .= \html_writer::tag('option', $option['label'], ['value' => $option['value']]);
         }
         $element .= \html_writer::end_tag('datalist');
         $element .= \html_writer::end_tag('div');

classes/local/aws_helper.php

@@ -36,7 +36,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class aws_helper {
-
     /**
      * This creates a proxy string suitable for use with the AWS SDK.
      *
@@ -57,7 +56,7 @@ public static function get_proxy_string() {
         if (!empty($CFG->proxyhost)) {
             $proxy = $CFG->proxyhost;
             if (!empty($CFG->proxyport)) {
-                $proxy .= ':'. $CFG->proxyport;
+                $proxy .= ':' . $CFG->proxyport;
             }
             if (!empty($CFG->proxyuser) && !empty($CFG->proxypassword)) {
                 $proxy = $protocol . $CFG->proxyuser . ':' . $CFG->proxypassword . '@' . $proxy;

classes/local/client_factory.php

@@ -24,7 +24,7 @@
  */
 
 namespace local_aws\local;
-use \Aws\AwsClient;
+use Aws\AwsClient;
 
 /**
  * AWS Client factory. Retrieves a client with moodle specific HTTP configuration.

classes/local/guzzle_helper.php

@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class guzzle_helper {
-
     /**
      * Add additional configuration to the Guzzle client. For example, adding additional Middleware.
      *

classes/privacy/provider.php

@@ -13,6 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
 /**
  * Privacy provider.
  *
@@ -24,22 +25,21 @@
 namespace local_aws\privacy;
 
 use core_privacy\local\metadata\null_provider;
-use core_privacy\local\legacy_polyfill;
+
 /**
  * Class provider
  * @author    Ilya Tregubov (ilyatregubov@catalyst-au.net)
  * @copyright 2018 Catalyst IT
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class provider implements null_provider {
-    use legacy_polyfill;
     /**
      * Get the language string identifier with the component's language
      * file to explain why this plugin stores no data.
      *
      * @return  string
      */
-    public static function _get_reason() {
+    public static function get_reason(): string {
         return 'privacy:metadata';
     }
 }

sdk/Aws/Api/Parser/QueryParser.php

@@ -19,19 +19,19 @@ class QueryParser extends AbstractParser
     private $honorResultWrapper;
 
     /**
-     * @param Service   $api                Service description
-     * @param XmlParser $xmlParser          Optional XML parser
-     * @param bool      $honorResultWrapper Set to false to disable the peeling
-     *                                      back of result wrappers from the
-     *                                      output structure.
+     * @param Service                          $api                Service description
+     * @param \Aws\Api\Parser\XmlParser $xmlParser          Optional XML parser
+     * @param bool                             $honorResultWrapper Set to false to disable the peeling
+     *                                                            back of result wrappers from the
+     *                                                            output structure.
      */
     public function __construct(
         Service $api,
-        XmlParser $xmlParser = null,
+        \Aws\Api\Parser\XmlParser $xmlParser = null,
         $honorResultWrapper = true
     ) {
         parent::__construct($api);
-        $this->parser = $xmlParser ?: new XmlParser();
+        $this->parser = $xmlParser ?: new \Aws\Api\Parser\XmlParser();
         $this->honorResultWrapper = $honorResultWrapper;
     }
 

sdk/Aws/Api/Parser/RestXmlParser.php

@@ -14,13 +14,13 @@ class RestXmlParser extends AbstractRestParser
     use PayloadParserTrait;
 
     /**
-     * @param Service   $api    Service description
-     * @param XmlParser $parser XML body parser
+     * @param Service                          $api    Service description
+     * @param \Aws\Api\Parser\XmlParser $parser XML body parser
      */
-    public function __construct(Service $api, XmlParser $parser = null)
+    public function __construct(Service $api, \Aws\Api\Parser\XmlParser $parser = null)
     {
         parent::__construct($api);
-        $this->parser = $parser ?: new XmlParser();
+        $this->parser = $parser ?: new \Aws\Api\Parser\XmlParser();
     }
 
     protected function payload(

sdk/Aws/Crypto/AesDecryptingStream.php

@@ -65,7 +65,7 @@ public function getCurrentIv()
         return $this->cipherMethod->getCurrentIv();
     }
 
-    public function getSize()
+    public function getSize(): ?int
     {
         $plainTextSize = $this->stream->getSize();
 
@@ -80,12 +80,12 @@ public function getSize()
         return $plainTextSize;
     }
 
-    public function isWritable()
+    public function isWritable(): bool
     {
         return false;
     }
 
-    public function read($length)
+    public function read($length): string
     {
         if ($length > strlen($this->buffer)) {
             $this->buffer .= $this->decryptBlock(
@@ -101,7 +101,7 @@ public function read($length)
         return $data ? $data : '';
     }
 
-    public function seek($offset, $whence = SEEK_SET)
+    public function seek($offset, $whence = SEEK_SET): void
     {
         if ($offset === 0 && $whence === SEEK_SET) {
             $this->buffer = '';

sdk/Aws/Crypto/AesEncryptingStream.php

@@ -65,7 +65,7 @@ public function getCurrentIv()
         return $this->cipherMethod->getCurrentIv();
     }
 
-    public function getSize()
+    public function getSize(): ?int
     {
         $plainTextSize = $this->stream->getSize();
 
@@ -79,12 +79,12 @@ public function getSize()
         return $plainTextSize;
     }
 
-    public function isWritable()
+    public function isWritable(): bool
     {
         return false;
     }
 
-    public function read($length)
+    public function read($length): string
     {
         if ($length > strlen($this->buffer)) {
             $this->buffer .= $this->encryptBlock(
@@ -99,7 +99,7 @@ public function read($length)
         return $data ? $data : '';
     }
 
-    public function seek($offset, $whence = SEEK_SET)
+    public function seek($offset, $whence = SEEK_SET): void
     {
         if ($whence === SEEK_CUR) {
             $offset = $this->tell() + $offset;

sdk/Aws/Crypto/AesGcmDecryptingStream.php

@@ -100,7 +100,7 @@ public function createStream()
         }
     }
 
-    public function isWritable()
+    public function isWritable(): bool
     {
         return false;
     }

sdk/Aws/Crypto/AesGcmEncryptingStream.php

@@ -118,7 +118,7 @@ public function getTag()
         return $this->tag;
     }
 
-    public function isWritable()
+    public function isWritable(): bool
     {
         return false;
     }

sdk/Aws/Handler/GuzzleV5/PsrStream.php

@@ -22,12 +22,12 @@ public function __construct(GuzzleStreamInterface $stream)
         $this->stream = $stream;
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->stream->seek(0);
     }
 
-    public function getContents()
+    public function getContents(): string
     {
         return $this->stream->getContents();
     }

sdk/Aws/HashingStream.php

@@ -36,7 +36,7 @@ public function __construct(
         $this->callback = $onComplete;
     }
 
-    public function read($length)
+    public function read($length): string
     {
         $data = $this->stream->read($length);
         $this->hash->update($data);
@@ -50,14 +50,15 @@ public function read($length)
         return $data;
     }
 
-    public function seek($offset, $whence = SEEK_SET)
+    public function seek($offset, $whence = SEEK_SET): void
     {
         if ($offset === 0) {
             $this->hash->reset();
-            return $this->stream->seek($offset);
+            $this->stream->seek($offset);
+            return;
         }
 
         // Seeking arbitrarily is not supported.
-        return false;
+        throw new \LogicException('Cannot seek to arbitrary positions on a HashingStream');
     }
 }

sdk/GuzzleHttp/Psr7/AppendStream.php

@@ -31,7 +31,7 @@ public function __construct(array $streams = [])
         }
     }
 
-    public function __toString()
+    public function __toString(): string
     {
         try {
             $this->rewind();
@@ -62,7 +62,7 @@ public function addStream(StreamInterface $stream)
         $this->streams[] = $stream;
     }
 
-    public function getContents()
+    public function getContents(): string
     {
         return Utils::copyToString($this);
     }
@@ -72,7 +72,7 @@ public function getContents()
      *
      * {@inheritdoc}
      */
-    public function close()
+    public function close(): void
     {
         $this->pos = $this->current = 0;
         $this->seekable = true;
@@ -105,7 +105,7 @@ public function detach()
         return null;
     }
 
-    public function tell()
+    public function tell(): int
     {
         return $this->pos;
     }
@@ -118,7 +118,7 @@ public function tell()
      *
      * {@inheritdoc}
      */
-    public function getSize()
+    public function getSize(): ?int
     {
         $size = 0;
 
@@ -133,14 +133,14 @@ public function getSize()
         return $size;
     }
 
-    public function eof()
+    public function eof(): bool
     {
         return !$this->streams ||
             ($this->current >= count($this->streams) - 1 &&
              $this->streams[$this->current]->eof());
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->seek(0);
     }
@@ -150,7 +150,7 @@ public function rewind()
      *
      * {@inheritdoc}
      */
-    public function seek($offset, $whence = SEEK_SET)
+    public function seek($offset, $whence = SEEK_SET): void
     {
         if (!$this->seekable) {
             throw new \RuntimeException('This AppendStream is not seekable');
@@ -184,7 +184,7 @@ public function seek($offset, $whence = SEEK_SET)
      *
      * {@inheritdoc}
      */
-    public function read($length)
+    public function read($length): string
     {
         $buffer = '';
         $total = count($this->streams) - 1;
@@ -219,22 +219,22 @@ public function read($length)
         return $buffer;
     }
 
-    public function isReadable()
+    public function isReadable(): bool
     {
         return true;
     }
 
-    public function isWritable()
+    public function isWritable(): bool
     {
         return false;
     }
 
-    public function isSeekable()
+    public function isSeekable(): bool
     {
         return $this->seekable;
     }
 
-    public function write($string)
+    public function write($string): int
     {
         throw new \RuntimeException('Cannot write to an AppendStream');
     }