Browse Source

Merge branch 'master' into 3.0

* master:
  DX: move report schemas to dedicated dir
  rename doc -> doc.php
  fix false-positive
  CICD - temporarily disable problematic test
  DX: cleanup php-cs-fixer entry file
  Add © for logo
  DX: cleanup NullableTypeTransformerTest
SpacePossum 4 years ago
parent
commit
41ee6fc437

+ 1 - 1
.php_cs.dist

@@ -14,7 +14,7 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('tests/Fixtures')
     ->in(__DIR__)
     ->append([
-        __DIR__.'/dev-tools/doc',
+        __DIR__.'/dev-tools/doc.php',
         __DIR__.'/php-cs-fixer',
     ])
 ;

+ 1 - 1
CONTRIBUTING.md

@@ -28,7 +28,7 @@ Symfony projects for instance).
 * If you are adding functionality or fixing a bug - add a test! Prefer adding new test cases over modifying existing ones.
 * Make sure there is no wrong file permissions in the repository: `./dev-tools/check_file_permissions.sh`.
 * Make sure there is no trailing spaces in the code: `./dev-tools/check_trailing_spaces.sh`.
-* Update documentation: `php dev-tools/doc`. This requires the highest version of PHP supported by PHP CS Fixer. If it is not installed on your system, you can run it in a Docker container instead: `docker run -it --rm --user="$(id -u):$(id -g)" -w="/app" --volume="$(pwd):/app" php:7.4-cli php dev-tools/doc`.
+* Update documentation: `php dev-tools/doc.php`. This requires the highest version of PHP supported by PHP CS Fixer. If it is not installed on your system, you can run it in a Docker container instead: `docker run -it --rm --user="$(id -u):$(id -g)" -w="/app" --volume="$(pwd):/app" php:7.4-cli php dev-tools/doc.php`.
 * Install dev tools: `dev-tools/install.sh`
 * Run static analysis using PHPStan: `php -d memory_limit=256M dev-tools/vendor/bin/phpstan analyse`
 * Check if tests pass: `vendor/bin/phpunit`.

+ 1 - 1
dev-tools/check_file_permissions.sh

@@ -5,7 +5,7 @@ files_with_wrong_permissions=$(
     git ls-files --stage . \
         ':!*.sh' \
         ':!php-cs-fixer' \
-    | grep -P "100\d\d(1|3|5|7) " \
+    | grep -P "^100\d\d(1|3|5|7) " \
     | sort -fh
 )
 

+ 0 - 0
dev-tools/doc → dev-tools/doc.php


+ 1 - 1
doc/cookbook_fixers.rst

@@ -279,7 +279,7 @@ Execute the following command in your command shell:
 
 .. code-block:: console
 
-   $ php dev-tools/doc
+   $ php dev-tools/doc.php
 
 Next, we must filter what type of tokens we want to fix. Here, we are interested in code that contains ``T_COMMENT`` tokens:
 

+ 0 - 0
doc/checkstyle.xsd → doc/report-schema/checkstyle.xsd


+ 0 - 0
doc/junit-10.xsd → doc/report-schema/junit-10.xsd


+ 0 - 0
doc/schema.json → doc/report-schema/schema.json


+ 0 - 0
doc/xml.xsd → doc/report-schema/xml.xsd


+ 2 - 2
doc/usage.rst

@@ -22,8 +22,8 @@ The ``--format`` option for the output format. Supported formats are ``txt`` (de
 
 NOTE: the output for the following formats are generated in accordance with XML schemas
 
-* ``junit`` follows the `JUnit xml schema from Jenkins </doc/junit-10.xsd>`_
-* ``checkstyle`` follows the common `"checkstyle" xml schema </doc/checkstyle.xsd>`_
+* ``checkstyle`` follows the common `"checkstyle" xml schema </doc/report-schema/checkstyle.xsd>`_
+* ``junit`` follows the `JUnit xml schema from Jenkins </doc/report-schema/junit-10.xsd>`_
 
 The ``--quiet`` Do not output any message.
 

Some files were not shown because too many files changed in this diff