V.next

.github/workflows/php.yml

@@ -1,23 +1,22 @@
-name: PHP8.0-CI
+name: PHP8.5-CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: "8.5"
           extensions: mbstring, xml, curl
           tools: phpunit, composer
 

.github/workflows/php8.1.yml

@@ -2,22 +2,21 @@ name: PHP8.1-CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.1'
+          php-version: "8.1"
           extensions: mbstring, xml, curl
           tools: phpunit, composer
 

.github/workflows/php8.2.yml

@@ -2,22 +2,21 @@ name: PHP8.2-CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: "8.2"
           extensions: mbstring, xml, curl
           tools: phpunit, composer
 

.github/workflows/php5.6.yml → .github/workflows/php8.3.yml

@@ -1,23 +1,22 @@
-name: PHP5.6-CI
+name: PHP8.3-CI
 
 on:
   push:
-    branches: [ php56-backport ]
+    branches: [master]
   pull_request:
-    branches: [ php56-backport ]
+    branches: [master]
 
 jobs:
   build:
-
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '5.6'
+          php-version: "8.3"
           extensions: mbstring, xml, curl
           tools: phpunit, composer
 

.github/workflows/php7.4.yml → .github/workflows/php8.4.yml

@@ -1,23 +1,22 @@
-name: PHP7.4-CI
+name: PHP8.4-CI
 
 on:
   push:
-    branches: [ php56-backport ]
+    branches: [master]
   pull_request:
-    branches: [ php56-backport ]
+    branches: [master]
 
 jobs:
   build:
-
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.4'
+          php-version: "8.4"
           extensions: mbstring, xml, curl
           tools: phpunit, composer
 

src/ArrayTrait.php

@@ -44,7 +44,8 @@ public function __unset($name) {
      * @param string $value
      * @ignore
      */
-    public function offsetSet($offset, $value)
+    #[\ReturnTypeWillChange]
+    public function offsetSet(mixed $offset, mixed $value): void
     {
 
         if (is_callable([$this, 'set' . $offset])) {
@@ -58,6 +59,7 @@ public function offsetSet($offset, $value)
      * @return bool
      * @ignore
      */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return is_callable([$this, 'get' . $offset]) ||
@@ -69,6 +71,7 @@ public function offsetExists($offset)
      * @param string $offset
      * @ignore
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
 
@@ -83,6 +86,7 @@ public function offsetUnset($offset)
      * @return mixed|null
      * @ignore
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
 
@@ -116,4 +120,4 @@ public function offsetGet($offset)
 
         return null;
     }
-}
+}

src/Color.php

@@ -342,19 +342,19 @@ public static function hex2rgba_values($hex)
 
         switch (strlen($hex)) {
 
-            case 4;
+            case 4:
 
                 return [hexdec($hex[1] . $hex[1]), hexdec($hex[2] . $hex[2]), hexdec($hex[3] . $hex[3])];
 
-            case 5;
+            case 5:
 
                 return [hexdec($hex[1] . $hex[1]), hexdec($hex[2] . $hex[2]), hexdec($hex[3] . $hex[3]), ValueNumber::compress(round(hexdec($hex[4] . $hex[4]) / 255, 2))];
 
-            case 7;
+            case 7:
 
                 return [hexdec($hex[1] . $hex[2]), hexdec($hex[3] . $hex[4]), hexdec($hex[5] . $hex[6])];
 
-            case 9;
+            case 9:
 
                 return [hexdec($hex[1] . $hex[2]), hexdec($hex[3] . $hex[4]), hexdec($hex[5] . $hex[6]), ValueNumber::compress(round(hexdec($hex[7] . $hex[8]) / 255, 2))];
         }

src/Element.php

@@ -613,7 +613,8 @@ public function getAst()
      * @return stdClass
      * @ignore
      */
-    public function jsonSerialize () {
+    #[\ReturnTypeWillChange]
+    public function jsonSerialize (): mixed {
 
         return $this->getAst();
     }
@@ -652,4 +653,4 @@ public function toObject()
     {
        return $this->ast;
     }
-}
+}

src/Element/AtRule.php

@@ -100,7 +100,7 @@ public function addDeclaration ($name, $value) {
      * @return \stdClass
      * @ignore
      */
-    public function jsonSerialize () {
+    public function jsonSerialize (): mixed {
 
         $ast = parent::jsonSerialize();
 
@@ -116,4 +116,4 @@ public function jsonSerialize () {
 
         return $ast;
     }
-}
+}

src/Property/Comment.php → src/Element/Declaration/Comment.php

@@ -1,9 +1,8 @@
 <?php
 
-namespace TBela\CSS\Property;
+namespace TBela\CSS\Element\Declaration;
 
 use TBela\CSS\Interfaces\RenderableInterface;
-use TBela\CSS\Value;
 
 /**
  * Comment property class

src/Property/Config.php → src/Element/Declaration/Config.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace TBela\CSS\Property;
+namespace TBela\CSS\Element\Declaration;
 
-$file = dirname(__DIR__).'/config.json';
+$file = dirname(__DIR__.'/../../..').'/config.json';
 
 if (is_file($file)) {
 
@@ -29,7 +29,8 @@ final class Config {
      * load properties configuration from a JSON file
      * @param string $file
      */
-    public static function load($file) {
+    public static function load(string $file): void
+	{
 
         Config::$config = json_decode(file_get_contents($file), true) ?? [];
     }
@@ -39,7 +40,8 @@ public static function load($file) {
      * @param string $path
      * @return bool
      */
-    public static function exists($path) {
+    public static function exists(string $path): bool
+	{
 
         $found = true;
         $item = Config::$config['alias'];
@@ -83,7 +85,8 @@ public static function exists($path) {
      * @return mixed|null
      * @ignore
      */
-    public static function getPath($path, $default = null) {
+    public static function getPath(string $path, mixed $default = null): mixed
+	{
 
         $data = Config::$config;
 
@@ -106,7 +109,8 @@ public static function getPath($path, $default = null) {
      * @param mixed|null $default
      * @return array|mixed|null
      */
-    public static function getProperty ($name = null, $default = null) {
+    public static function getProperty (?string $name = null, mixed $default = null): mixed
+	{
 
         if (is_null($name)) {
 
@@ -136,7 +140,8 @@ public static function getProperty ($name = null, $default = null) {
      * @return array
      * @ignore
      */
-    public static function addSet ($shorthand, $pattern, array $properties, $separator = null, $shorthandOverride = null) {
+    public static function addSet ($shorthand, $pattern, array $properties, ?string $separator = null, ?string $shorthandOverride = null): array
+	{
 
         $config = [];
 
@@ -157,7 +162,7 @@ public static function addSet ($shorthand, $pattern, array $properties, $separat
         // build value map
         foreach ($properties as $property => $data) {
 
-            if (strpos($property, '.') !== false) {
+            if (str_contains($property, '.')) {
 
                 continue;
             }
@@ -167,7 +172,7 @@ public static function addSet ($shorthand, $pattern, array $properties, $separat
 
         foreach ($properties as $property => $data) {
 
-            if (strpos($property, '.') !== false) {
+            if (str_contains($property, '.')) {
 
                 $config[$shorthand][preg_replace('#^[^.]+\.#', '', $property)] = $data;
                 continue;
@@ -177,7 +182,7 @@ public static function addSet ($shorthand, $pattern, array $properties, $separat
 
             if (isset($data['value_map'])) {
 
-                $map_keys = $value_map_keys[$properties[$property]['type']];
+                $map_keys = $value_map_keys[$data['type']];
 
                 $config[$shorthand]['value_map'][$property] = array_map(function ($value) use ($map_keys) {
 

src/Property/Property.php → src/Element/Declaration/Property.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace TBela\CSS\Property;
+namespace TBela\CSS\Element\Declaration;
 
 use ArrayAccess;
 use TBela\CSS\ArrayTrait;

src/Property/PropertyList.php → src/Element/Declaration/PropertyList.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace TBela\CSS\Property;
+namespace TBela\CSS\Element\Declaration;
 
 use ArrayIterator;
 use IteratorAggregate;
-use TBela\CSS\Value;
 use TBela\CSS\Element\Rule;
 use TBela\CSS\Element\RuleList;
 
@@ -36,7 +35,7 @@ class PropertyList implements IteratorAggregate
      * @param RuleList|null $list
      * @param array $options
      */
-    public function __construct(RuleList $list = null, array $options = [])
+    public function __construct(?RuleList $list = null, array $options = [])
     {
 
         $this->options = array_merge($this->options, $options);
@@ -360,7 +359,8 @@ public function isEmpty() {
     /**
      * @inheritDoc
      */
-    public function getIterator()
+    #[\ReturnTypeWillChange]
+    public function getIterator(): \Traversable
     {
         return $this->getProperties();
     }