Merge branch 'release/2.0.4'

WsdlToPhp · Mar 24, 2022 · 131785c · 131785c
2 parents c0142e4 + acfb349
commit 131785c
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 28 deletions.
diff --git a/.php_cs → .php-cs-fixer.php b/.php_cs → .php-cs-fixer.php
@@ -4,7 +4,7 @@
     ->exclude('vendor')
     ->in(__DIR__);
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setUsingCache(false)
     ->setRules(array(
         '@PhpCsFixer' => true,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 2.0.4 - 2022/03/24
+- Upgrade PHP CS Fixer
+
 ## 2.0.3 - 2022/03/24
 - Update badges
 - Remove Travis CI settings

diff --git a/composer.json b/composer.json
@@ -45,7 +45,7 @@
         "phpstan": "vendor/bin/phpstan analyze src --level=6"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.0",
+        "friendsofphp/php-cs-fixer": "^3.0",
         "phpstan/phpstan": "^1.4",
         "phpunit/phpunit": "^9"
     },

diff --git a/src/Created.php b/src/Created.php
@@ -6,7 +6,7 @@
 
 class Created extends Element
 {
-    const NAME = 'Created';
+    public const NAME = 'Created';
 
     public function __construct(int $timestamp, string $namespace = self::NS_WSSU)
     {

diff --git a/src/Element.php b/src/Element.php
@@ -15,13 +15,13 @@
  */
 class Element
 {
-    const NS_WSSE = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
+    public const NS_WSSE = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd';
 
-    const NS_WSSE_NAME = 'wsse';
+    public const NS_WSSE_NAME = 'wsse';
 
-    const NS_WSSU = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd';
+    public const NS_WSSU = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd';
 
-    const NS_WSSU_NAME = 'wssu';
+    public const NS_WSSU_NAME = 'wssu';
 
     protected string $name = '';
 
@@ -79,7 +79,7 @@ public function __construct(string $name, string $namespace, $value = null, arra
      *
      * @param bool $asDomElement returns elements as a \DOMElement or as a string
      *
-     * @return DOMElement|string|false
+     * @return DOMElement|false|string
      */
     protected function __toSend(bool $asDomElement = false)
     {
@@ -207,7 +207,7 @@ public function setTimestampValue(int $timestampValue): self
     /**
      * Returns the element to send as WS-Security header.
      *
-     * @return DOMElement|string|false
+     * @return DOMElement|false|string
      */
     public function toSend()
     {

diff --git a/src/Expires.php b/src/Expires.php
@@ -6,7 +6,7 @@
 
 class Expires extends Element
 {
-    const NAME = 'Expires';
+    public const NAME = 'Expires';
 
     public function __construct(int $timestamp, int $expiresIn = 3600, string $namespace = self::NS_WSSU)
     {

diff --git a/src/Nonce.php b/src/Nonce.php
@@ -6,11 +6,11 @@
 
 class Nonce extends Element
 {
-    const NAME = 'Nonce';
+    public const NAME = 'Nonce';
 
-    const ATTRIBUTE_ENCODING_TYPE = 'EncodingType';
+    public const ATTRIBUTE_ENCODING_TYPE = 'EncodingType';
 
-    const NS_ENCODING = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary';
+    public const NS_ENCODING = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary';
 
     public function __construct(string $nonce, string $namespace = self::NS_WSSE)
     {

diff --git a/src/Password.php b/src/Password.php
@@ -6,13 +6,13 @@
 
 class Password extends Element
 {
-    const NAME = 'Password';
+    public const NAME = 'Password';
 
-    const ATTRIBUTE_TYPE = 'Type';
+    public const ATTRIBUTE_TYPE = 'Type';
 
-    const TYPE_PASSWORD_DIGEST = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest';
+    public const TYPE_PASSWORD_DIGEST = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest';
 
-    const TYPE_PASSWORD_TEXT = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText';
+    public const TYPE_PASSWORD_TEXT = 'http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText';
 
     protected string $typeValue;
 

diff --git a/src/Security.php b/src/Security.php
@@ -8,13 +8,13 @@
 
 class Security extends Element
 {
-    const NAME = 'Security';
+    public const NAME = 'Security';
 
-    const ATTRIBUTE_MUST_UNDERSTAND = ':mustunderstand';
+    public const ATTRIBUTE_MUST_UNDERSTAND = ':mustunderstand';
 
-    const ATTRIBUTE_ACTOR = ':actor';
+    public const ATTRIBUTE_ACTOR = ':actor';
 
-    const ENV_NAMESPACE = 'SOAP-ENV';
+    public const ENV_NAMESPACE = 'SOAP-ENV';
 
     protected ?UsernameToken $usernameToken = null;
 
@@ -38,7 +38,7 @@ public function __construct(bool $mustUnderstand = false, ?string $actor = null,
      *
      * @param bool $asDomElement returns elements as a DOMElement or as a string
      *
-     * @return DOMElement|string|false
+     * @return DOMElement|false|string
      */
     protected function __toSend(bool $asDomElement = false)
     {

diff --git a/src/Timestamp.php b/src/Timestamp.php
@@ -8,7 +8,7 @@
 
 class Timestamp extends Element
 {
-    const NAME = 'Timestamp';
+    public const NAME = 'Timestamp';
 
     protected ?Created $created;
 
@@ -24,7 +24,7 @@ public function __construct(string $namespace = self::NS_WSSU)
      *
      * @param bool $asDomElement returns elements as a DOMElement or as a string
      *
-     * @return DOMElement|string|false
+     * @return DOMElement|false|string
      */
     protected function __toSend(bool $asDomElement = false)
     {

diff --git a/src/Username.php b/src/Username.php
@@ -6,7 +6,7 @@
 
 class Username extends Element
 {
-    const NAME = 'Username';
+    public const NAME = 'Username';
 
     public function __construct(string $username, string $namespace = self::NS_WSSE)
     {

diff --git a/src/UsernameToken.php b/src/UsernameToken.php
@@ -8,9 +8,9 @@
 
 class UsernameToken extends Element
 {
-    const NAME = 'UsernameToken';
+    public const NAME = 'UsernameToken';
 
-    const ATTRIBUTE_ID = 'Id';
+    public const ATTRIBUTE_ID = 'Id';
 
     protected ?Username $username = null;
 
@@ -32,7 +32,7 @@ public function __construct(?string $id = null, string $namespace = self::NS_WSS
      *
      * @param bool $asDomElement returns elements as a DOMElement or as a string
      *
-     * @return DOMElement|string|false
+     * @return DOMElement|false|string
      */
     protected function __toSend(bool $asDomElement = false)
     {