Merge pull request #47 from matthiasnoback/fix_default_style

matthiasnoback · web-flow · commit 8e4d48c006d5 · 2021-02-14T13:05:06.000+01:00
Improvements
diff --git a/.github/workflows/code-style.yaml b/.github/workflows/code-style.yaml
@@ -0,0 +1,35 @@
+name: Code style
+
+on:
+  pull_request: null
+  push:
+    branches:
+      - master
+
+jobs:
+  code_analysis:
+    strategy:
+      fail-fast: false
+      matrix:
+        actions:
+          -
+            name: "Code style"
+            run: vendor/bin/php-cs-fixer fix -v --diff --dry-run
+        php-versions: ['7.4']
+
+    name: ${{ matrix.actions.name }}
+    runs-on: ubuntu-latest
+
+    steps:
+      -   uses: actions/checkout@v2
+
+      # see https://github.com/shivammathur/setup-php
+      -   uses: shivammathur/setup-php@v2
+          with:
+            php-version: ${{ matrix.php-versions }}
+            coverage: none
+
+      # composer install cache - https://github.com/ramsey/composer-install
+      -   uses: "ramsey/composer-install@v1"
+
+      -   run: ${{ matrix.actions.run }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -0,0 +1,35 @@
+name: Tests
+
+on:
+    pull_request: null
+    push:
+        branches:
+            - master
+
+jobs:
+    code_analysis:
+        strategy:
+            fail-fast: false
+            matrix:
+                actions:
+                    -
+                        name: "Behat"
+                        run: vendor/bin/behat
+                php-versions: ['7.4', '8.0']
+
+        name: ${{ matrix.actions.name }}
+        runs-on: ubuntu-latest
+
+        steps:
+            -   uses: actions/checkout@v2
+
+            # see https://github.com/shivammathur/setup-php
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-versions }}
+                    coverage: none
+
+            # composer install cache - https://github.com/ramsey/composer-install
+            -   uses: "ramsey/composer-install@v1"
+
+            -   run: ${{ matrix.actions.run }}
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /test/temp/
 /vendor/
 /composer.lock
+/.env
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014 Matthias Noback
+Copyright (c) Matthias Noback
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
@@ -2,8 +2,6 @@
 
 By Matthias Noback
 
-[![Build Status](https://travis-ci.org/matthiasnoback/symfony-console-form.svg?branch=master)](https://travis-ci.org/matthiasnoback/symfony-console-form)
-
 This package contains a Symfony bundle and some tools which enable you to use Symfony Form types to define and
 interactively process user input from the CLI.
 
diff --git a/bin/composer b/bin/composer
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -eu
+
+# Copy user and group ID into .env file
+printf "HOST_UID=%s\nHOST_GID=%s\n" "$(id -u)" "$(id -g)" > .env
+
+docker-compose run --rm composer --ignore-platform-reqs "$@"
diff --git a/bin/php b/bin/php
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -eu
+
+# Copy user and group ID into .env file
+printf "HOST_UID=%s\nHOST_GID=%s\n" "$(id -u)" "$(id -g)" > .env
+
+docker-compose run --rm php php "$@"
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         }
     },
     "require": {
-        "php": ">=7.2",
+        "php": ">=7.4",
         "symfony/form": "~5.0",
         "symfony/console": "~5.0",
         "symfony/translation": "~5.0"
@@ -37,6 +37,6 @@
         "symfony/validator": "~5.0",
         "symfony/yaml": "~5.0",
         "symfony/security-csrf": "~5.0",
-        "phpunit/phpunit": "^7"
+        "phpunit/phpunit": "^9.5"
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,22 @@
+version: '3'
+
+services:
+  composer:
+    image: composer:latest
+    working_dir: /app
+    volumes:
+      - ./:/app
+    env_file:
+      - .env
+    user: ${HOST_UID}:${HOST_GID}
+    init: true
+
+  php:
+    image: php:7.4-cli-alpine
+    working_dir: /app
+    volumes:
+      - ./:/app
+    env_file:
+      - .env
+    user: ${HOST_UID}:${HOST_GID}
+    init: true
diff --git a/git-hooks/pre-commit b/git-hooks/pre-commit
@@ -4,20 +4,9 @@
 exec 1>&2
 
 ROOT="$PWD"
-PHP_CS_FIXER="${ROOT}/vendor/bin/php-cs-fixer"
-PHP_CS_CONFIG="${ROOT}/.php_cs"
-
-if [ ! -f "$PHP_CS_CONFIG" ]; then
-    echo "Please run 'git commit' from the root directory of the project"
-    exit 1
-fi
-
-if [ ! -x "$PHP_CS_FIXER" ]; then
-    echo "Please run 'composer install' first"
-    exit 1
-fi
+PHP_CS_FIXER="${ROOT}/bin/php vendor/bin/php-cs-fixer"
 
 git status --porcelain | grep -e '^[AM]\(.*\).php$' | cut -c 3- | while read line; do
-    $PHP_CS_FIXER fix --config=$PHP_CS_CONFIG --verbose "$line";
+    $PHP_CS_FIXER fix --verbose "$line";
     git add "$line";
 done
diff --git a/src/Bridge/Interaction/CollectionInteractor.php b/src/Bridge/Interaction/CollectionInteractor.php
@@ -119,7 +119,7 @@ private function printHeader(FormInterface $form, OutputInterface $output): void
     {
         $output->writeln(
             strtr(
-                '<fieldset>{label}</fieldset>',
+                '<comment>{label}</comment>',
                 [
                     '{label}' => FormUtil::label($form),
                 ]
@@ -131,7 +131,7 @@ private function printEditEntryHeader(int $entryNumber, OutputInterface $output)
     {
         $output->writeln(
             strtr(
-                '<fieldset>Edit entry {entryNumber}</fieldset>',
+                '<comment>Edit entry {entryNumber}</comment>',
                 [
                     '{entryNumber}' => $entryNumber,
                 ]
@@ -143,7 +143,7 @@ private function printAddEntryHeader(int $entryNumber, OutputInterface $output):
     {
         $output->writeln(
             strtr(
-                '<fieldset>Add entry {entryNumber}</fieldset>',
+                '<comment>Add entry {entryNumber}</comment>',
                 [
                     '{entryNumber}' => $entryNumber,
                 ]
diff --git a/src/Bundle/RegisterOutputFormatterStylesPass.php b/src/Bundle/RegisterOutputFormatterStylesPass.php
diff --git a/src/Bundle/SymfonyConsoleFormBundle.php b/src/Bundle/SymfonyConsoleFormBundle.php
@@ -16,14 +16,6 @@ public function build(ContainerBuilder $container): void
     {
         $container->addCompilerPass(new RegisterTransformersPass());
 
-        $container->addCompilerPass(
-            new RegisterOutputFormatterStylesPass(
-                'matthias_symfony_console.styles_collection',
-                'console_style',
-                'style'
-            )
-        );
-
         $container->addCompilerPass(
             new RegisterHelpersPass(
                 'matthias_symfony_console_form.helper_collection',
diff --git a/src/Bundle/SymfonyConsoleFormExtension.php b/src/Bundle/SymfonyConsoleFormExtension.php
@@ -13,7 +13,6 @@ public function load(array $config, ContainerBuilder $container): void
     {
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__));
         $loader->load('services.yml');
-        $loader->load('style.yml');
         $loader->load('helpers.yml');
     }
 
diff --git a/src/Bundle/style.yml b/src/Bundle/style.yml
diff --git a/src/Console/EventListener/RegisterOutputFormatterStylesEventListener.php b/src/Console/EventListener/RegisterOutputFormatterStylesEventListener.php
diff --git a/src/Console/EventListener/SetInputDefinitionOfFormBasedCommandEventListener.php b/src/Console/EventListener/SetInputDefinitionOfFormBasedCommandEventListener.php
@@ -8,6 +8,7 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Command\HelpCommand;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputInterface;
 
@@ -42,7 +43,7 @@ private function setInputDefinition(Command $command, InputInterface $input, Inp
     {
         $command->setDefinition($inputDefinition);
         $command->mergeApplicationDefinition();
-        $input->bind($inputDefinition);
+        $input->bind($command->getDefinition());
     }
 
     private function getCommandFromHelpCommand(HelpCommand $helpCommand): ?Command
diff --git a/src/Console/Formatter/Format.php b/src/Console/Formatter/Format.php
diff --git a/src/Console/Formatter/StylesCollection.php b/src/Console/Formatter/StylesCollection.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-Copyright (c) 2014 Matthias Noback`
	`1`	`+Copyright (c) Matthias Noback`
`2`	`2`
`3`	`3`	`Permission is hereby granted, free of charge, to any person obtaining a copy`
`4`	`4`	`of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`}`
`24`	`24`	`},`
`25`	`25`	`"require": {`
`26`		`- "php": ">=7.2",`
	`26`	`+ "php": ">=7.4",`
`27`	`27`	`"symfony/form": "~5.0",`
`28`	`28`	`"symfony/console": "~5.0",`
`29`	`29`	`"symfony/translation": "~5.0"`
`@@ -37,6 +37,6 @@`
`37`	`37`	`"symfony/validator": "~5.0",`
`38`	`38`	`"symfony/yaml": "~5.0",`
`39`	`39`	`"symfony/security-csrf": "~5.0",`
`40`		`- "phpunit/phpunit": "^7"`
	`40`	`+ "phpunit/phpunit": "^9.5"`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private function printHeader(FormInterface $form, OutputInterface $output): void`
`119`	`119`	`{`
`120`	`120`	`$output->writeln(`
`121`	`121`	`strtr(`
`122`		`- '<fieldset>{label}</fieldset>',`
	`122`	`+ '<comment>{label}</comment>',`
`123`	`123`	`[`
`124`	`124`	`'{label}' => FormUtil::label($form),`
`125`	`125`	`]`
`@@ -131,7 +131,7 @@ private function printEditEntryHeader(int $entryNumber, OutputInterface $output)`
`131`	`131`	`{`
`132`	`132`	`$output->writeln(`
`133`	`133`	`strtr(`
`134`		`- '<fieldset>Edit entry {entryNumber}</fieldset>',`
	`134`	`+ '<comment>Edit entry {entryNumber}</comment>',`
`135`	`135`	`[`
`136`	`136`	`'{entryNumber}' => $entryNumber,`
`137`	`137`	`]`
`@@ -143,7 +143,7 @@ private function printAddEntryHeader(int $entryNumber, OutputInterface $output):`
`143`	`143`	`{`
`144`	`144`	`$output->writeln(`
`145`	`145`	`strtr(`
`146`		`- '<fieldset>Add entry {entryNumber}</fieldset>',`
	`146`	`+ '<comment>Add entry {entryNumber}</comment>',`
`147`	`147`	`[`
`148`	`148`	`'{entryNumber}' => $entryNumber,`
`149`	`149`	`]`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ public function load(array $config, ContainerBuilder $container): void`
`13`	`13`	`{`
`14`	`14`	`$loader = new YamlFileLoader($container, new FileLocator(__DIR__));`
`15`	`15`	`$loader->load('services.yml');`
`16`		`- $loader->load('style.yml');`
`17`	`16`	`$loader->load('helpers.yml');`
`18`	`17`	`}`
`19`	`18`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use Symfony\Component\Console\Command\Command;`
`9`	`9`	`use Symfony\Component\Console\Command\HelpCommand;`
`10`	`10`	`use Symfony\Component\Console\Event\ConsoleCommandEvent;`
	`11`	`+use Symfony\Component\Console\Input\InputArgument;`
`11`	`12`	`use Symfony\Component\Console\Input\InputDefinition;`
`12`	`13`	`use Symfony\Component\Console\Input\InputInterface;`
`13`	`14`
`@@ -42,7 +43,7 @@ private function setInputDefinition(Command $command, InputInterface $input, Inp`
`42`	`43`	`{`
`43`	`44`	`$command->setDefinition($inputDefinition);`
`44`	`45`	`$command->mergeApplicationDefinition();`
`45`		`- $input->bind($inputDefinition);`
	`46`	`+ $input->bind($command->getDefinition());`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`private function getCommandFromHelpCommand(HelpCommand $helpCommand): ?Command`