PHP 8.2, reduce package size, small fixes.

bupy7 · Dec 12, 2022 · c60f1f3 · c60f1f3
1 parent 9426fd6
commit c60f1f3
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 9 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,7 @@
+/.gitignore export-ignore
+/.gitattributes export-ignore
+/phpunit.xml export-ignore
+/workenv export-ignore
+/tests export-ignore
+/.github export-ignore
+/phpcs.php
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,6 +20,7 @@ jobs:
           - 7.4
           - 8.0
           - 8.1
+          - 8.2
     steps:
       - uses: actions/checkout@v2
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@ php-html-form
 - *Dep*: Deprecated.
 - *Fix*: Fixed.
 
+2.0.2 [2022-12-12]
+------------------
+
+- Add: Support of PHP 8.2.
+- Enh: Reduce size of package.
+- Fix: Small fixes.
+
 2.0.1 [2022-01-30]
 ------------------
 

diff --git a/README.md b/README.md
@@ -359,6 +359,22 @@ $ XDEBUG_MODE=coverage ./vendor/bin/phpunit
 
 HTML coverage path: `build/coverage/index.html`
 
+Code style
+---
+
+To fix code style, run:
+
+```
+~/.composer/vendor/bin/php-cs-fixer fix --config=./phpcs.php --verbose
+```
+
+You have to install [PHP CS Fixer](https://github.com/PHP-CS-Fixer/PHP-CS-Fixer) at first, if you
+don't use build-in Docker image:
+
+```
+composer global require friendsofphp/php-cs-fixer "^3.13.0"
+```
+
 License
 ---
 

diff --git a/composer.json b/composer.json
@@ -26,8 +26,5 @@
   },
   "autoload-dev": {
     "classmap": ["tests/"]
-  },
-  "scripts": {
-    "cs:fix": "~/.composer/vendor/bin/php-cs-fixer fix --config=./phpcs.php --verbose"
   }
 }
diff --git a/phpcs.php b/phpcs.php
@@ -1,5 +1,10 @@
 <?php declare(strict_types=1);
 
+/**
+ * Configuration of code style fixer and checker for this library.
+ * This configuration compatible with friendsofphp/php-cs-fixer "^3.13.0".
+ */
+
 use PhpCsFixer\Finder;
 use PhpCsFixer\Config;
 

diff --git a/src/AdamWathan/Form/Elements/Checkbox.php b/src/AdamWathan/Form/Elements/Checkbox.php
@@ -89,7 +89,7 @@ protected function checkBinding()
         $oldValue = array_map('strval', $oldValue);
 
         if (in_array($currentValue, $oldValue)) {
-            return $this->check();
+            $this->check();
         }
     }
 

diff --git a/src/AdamWathan/Form/FormBuilder.php b/src/AdamWathan/Form/FormBuilder.php
@@ -5,8 +5,6 @@
 use AdamWathan\Form\Binding\BoundData;
 use AdamWathan\Form\Elements\Button;
 use AdamWathan\Form\Elements\Checkbox;
-use AdamWathan\Form\Elements\Date;
-use AdamWathan\Form\Elements\DateTimeLocal;
 use AdamWathan\Form\Elements\Email;
 use AdamWathan\Form\Elements\File;
 use AdamWathan\Form\Elements\FormOpen;

diff --git a/workenv/Dockerfile b/workenv/Dockerfile
@@ -1,6 +1,6 @@
-FROM php:8.1-cli-alpine
+FROM php:8.2-cli-alpine
 
-RUN apk add --no-cache $PHPIZE_DEPS
+RUN apk add --no-cache $PHPIZE_DEPS && apk add --update --no-cache linux-headers
 
 RUN pecl install xdebug && docker-php-ext-enable xdebug
 RUN rm -f /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
@@ -13,6 +13,6 @@ RUN if [ ${GITHUB_OAUTH_TOKEN} != false ]; then \
 ;fi
 RUN export COMPOSER_DISABLE_XDEBUG_WARN=1
 
-RUN composer global require friendsofphp/php-cs-fixer "^3.5.0"
+RUN composer global require friendsofphp/php-cs-fixer "^3.13.0"
 
 CMD ["php", "-a"]