Remove element traits

Rename Lang to Language to match the xs:language type
simplesamlphp · Jan 16, 2025 · f37d864 · f37d864
1 parent a73db7e
commit f37d864
Show file tree

Hide file tree

Showing 33 changed files with 195 additions and 1,517 deletions.
diff --git a/src/Assert/Assert.php b/src/Assert/Assert.php
@@ -28,7 +28,7 @@
  * @method static void validIDRefs(mixed $value, string $message = '', string $exception = '')
  * @method static void validInt(mixed $value, string $message = '', string $exception = '')
  * @method static void validInteger(mixed $value, string $message = '', string $exception = '')
- * @method static void validLang(mixed $value, string $message = '', string $exception = '')
+ * @method static void validLanguage(mixed $value, string $message = '', string $exception = '')
  * @method static void validLong(mixed $value, string $message = '', string $exception = '')
  * @method static void validMonth(mixed $value, string $message = '', string $exception = '')
  * @method static void validName(mixed $value, string $message = '', string $exception = '')
@@ -70,7 +70,7 @@
  * @method static void nullOrValidIDRefs(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidInt(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidInteger(mixed $value, string $message = '', string $exception = '')
- * @method static void nullOrValidLang(mixed $value, string $message = '', string $exception = '')
+ * @method static void nullOrValidLanguage(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidLong(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidMonth(mixed $value, string $message = '', string $exception = '')
  * @method static void nullOrValidName(mixed $value, string $message = '', string $exception = '')
@@ -112,7 +112,7 @@
  * @method static void allValidIDRefs(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidInt(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidInteger(mixed $value, string $message = '', string $exception = '')
- * @method static void allValidLang(mixed $value, string $message = '', string $exception = '')
+ * @method static void allValidLanguage(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidLong(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidMonth(mixed $value, string $message = '', string $exception = '')
  * @method static void allValidName(mixed $value, string $message = '', string $exception = '')
@@ -157,7 +157,7 @@ class Assert extends BaseAssert
     use IDRefsTrait;
     use IntTrait;
     use IntegerTrait;
-    use LangTrait;
+    use LanguageTrait;
     use LongTrait;
     use MonthTrait;
     use NameTrait;

diff --git a/src/Assert/LangTrait.php → src/Assert/LanguageTrait.php b/src/Assert/LangTrait.php → src/Assert/LanguageTrait.php
@@ -9,21 +9,21 @@
 /**
  * @package simplesamlphp/xml-common
  */
-trait LangTrait
+trait LanguageTrait
 {
     /** @var string */
-    private static string $lang_regex = '/^([a-z]{2}|[i]-[a-z]+|[x]-[a-z]{1,8})(-[a-z]{1,8})*$/Di';
+    private static string $language_regex = '/^([a-z]{2}|[i]-[a-z]+|[x]-[a-z]{1,8})(-[a-z]{1,8})*$/Di';
 
 
     /**
      * @param string $value
      * @param string $message
      */
-    protected static function validLang(string $value, string $message = ''): void
+    protected static function validLanguage(string $value, string $message = ''): void
     {
         Assert::regex(
             $value,
-            self::$lang_regex,
+            self::$language_regex,
             $message ?: '%s is not a valid xs:language',
             InvalidArgumentException::class,
         );

diff --git a/src/Base64ElementTrait.php b/src/Base64ElementTrait.php
diff --git a/src/BooleanElementTrait.php b/src/BooleanElementTrait.php
diff --git a/src/HexBinaryElementTrait.php b/src/HexBinaryElementTrait.php
diff --git a/src/IntegerElementTrait.php b/src/IntegerElementTrait.php
diff --git a/src/LocalizedStringElementTrait.php b/src/LocalizedStringElementTrait.php