From 8fe54620f5fbc58bc732e701d8c16fbfe0c698ea Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Tue, 28 Nov 2017 14:12:55 -0500 Subject: [PATCH] Php templates --- composer.json | 1 + src/FileManager.php | 10 +++---- src/Maker/MakeAuthenticator.php | 2 +- src/Maker/MakeCommand.php | 2 +- src/Maker/MakeController.php | 2 +- src/Maker/MakeEntity.php | 4 +-- src/Maker/MakeForm.php | 2 +- src/Maker/MakeFunctionalTest.php | 2 +- src/Maker/MakeSerializerEncoder.php | 2 +- src/Maker/MakeSubscriber.php | 4 +-- src/Maker/MakeTwigExtension.php | 2 +- src/Maker/MakeUnitTest.php | 2 +- src/Maker/MakeValidator.php | 4 +-- src/Maker/MakeVoter.php | 2 +- src/MakerInterface.php | 4 ++- .../{Empty.php.txt => Empty.tpl.php} | 26 ++++++++--------- .../{Command.php.txt => Command.tpl.php} | 6 ++-- ...{Controller.php.txt => Controller.tpl.php} | 6 ++-- ...wig.php.txt => ControllerWithTwig.tpl.php} | 6 ++-- .../{Entity.php.txt => Entity.tpl.php} | 6 ++-- .../skeleton/doctrine/Repository.php.txt | 28 ------------------- .../skeleton/doctrine/Repository.tpl.php | 28 +++++++++++++++++++ .../skeleton/event/Subscriber.php.txt | 20 ------------- .../skeleton/event/Subscriber.tpl.php | 21 ++++++++++++++ .../form/{Type.php.txt => Type.tpl.php} | 8 +++--- .../security/{Voter.php.txt => Voter.tpl.php} | 4 +-- .../{Encoder.php.txt => Encoder.tpl.php} | 8 +++--- ...{Functional.php.txt => Functional.tpl.php} | 4 +-- .../test/{Unit.php.txt => Unit.tpl.php} | 4 +-- .../{Extension.php.txt => Extension.tpl.php} | 4 +-- ...{Constraint.php.txt => Constraint.tpl.php} | 4 +-- .../{Validator.php.txt => Validator.tpl.php} | 6 ++-- tests/Command/FunctionalTest.php | 4 +-- 33 files changed, 120 insertions(+), 118 deletions(-) rename src/Resources/skeleton/authenticator/{Empty.php.txt => Empty.tpl.php} (84%) rename src/Resources/skeleton/command/{Command.php.txt => Command.tpl.php} (88%) rename src/Resources/skeleton/controller/{Controller.php.txt => Controller.tpl.php} (69%) rename src/Resources/skeleton/controller/{ControllerWithTwig.php.txt => ControllerWithTwig.tpl.php} (76%) rename src/Resources/skeleton/doctrine/{Entity.php.txt => Entity.tpl.php} (60%) delete mode 100644 src/Resources/skeleton/doctrine/Repository.php.txt create mode 100644 src/Resources/skeleton/doctrine/Repository.tpl.php delete mode 100644 src/Resources/skeleton/event/Subscriber.php.txt create mode 100644 src/Resources/skeleton/event/Subscriber.tpl.php rename src/Resources/skeleton/form/{Type.php.txt => Type.tpl.php} (74%) rename src/Resources/skeleton/security/{Voter.php.txt => Voter.tpl.php} (95%) rename src/Resources/skeleton/serializer/{Encoder.php.txt => Encoder.tpl.php} (81%) rename src/Resources/skeleton/test/{Functional.php.txt => Functional.tpl.php} (85%) rename src/Resources/skeleton/test/{Unit.php.txt => Unit.tpl.php} (68%) rename src/Resources/skeleton/twig/{Extension.php.txt => Extension.tpl.php} (86%) rename src/Resources/skeleton/validator/{Constraint.php.txt => Constraint.tpl.php} (81%) rename src/Resources/skeleton/validator/{Validator.php.txt => Validator.tpl.php} (71%) diff --git a/composer.json b/composer.json index 47b64fa62..5cfc40b06 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "symfony/http-kernel": "^3.4|^4.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^2.8", "symfony/phpunit-bridge": "^3.4|^4.0", "symfony/process": "^3.4|^4.0" }, diff --git a/src/FileManager.php b/src/FileManager.php index 9c0012396..f2bb6ecd3 100644 --- a/src/FileManager.php +++ b/src/FileManager.php @@ -40,13 +40,11 @@ public function setIO(SymfonyStyle $io): void public function parseTemplate(string $templatePath, array $parameters): string { - $keys = array_keys($parameters); - $values = array_values($parameters); - $placeholders = array_map(function ($name) { - return "{{ $name }}"; - }, $keys); + ob_start(); + extract($parameters, EXTR_SKIP); + include $templatePath; - return str_replace($placeholders, $values, file_get_contents($templatePath)); + return ob_get_clean(); } public function dumpFile(string $filename, string $content): void diff --git a/src/Maker/MakeAuthenticator.php b/src/Maker/MakeAuthenticator.php index ed8ff1988..c2ee548cd 100644 --- a/src/Maker/MakeAuthenticator.php +++ b/src/Maker/MakeAuthenticator.php @@ -58,7 +58,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/authenticator/Empty.php.txt' => 'src/Security/'.$params['class_name'].'.php', + __DIR__.'/../Resources/skeleton/authenticator/Empty.tpl.php' => 'src/Security/'.$params['class_name'].'.php', ]; } diff --git a/src/Maker/MakeCommand.php b/src/Maker/MakeCommand.php index 314e276cb..99aedc636 100644 --- a/src/Maker/MakeCommand.php +++ b/src/Maker/MakeCommand.php @@ -60,7 +60,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/command/Command.php.txt' => 'src/Command/'.$params['command_class_name'].'.php', + __DIR__.'/../Resources/skeleton/command/Command.tpl.php' => 'src/Command/'.$params['command_class_name'].'.php', ]; } diff --git a/src/Maker/MakeController.php b/src/Maker/MakeController.php index a66ab8521..dbe628c34 100644 --- a/src/Maker/MakeController.php +++ b/src/Maker/MakeController.php @@ -69,7 +69,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { - $skeletonFile = $this->isTwigInstalled() ? 'ControllerWithTwig.php.txt' : 'Controller.php.txt'; + $skeletonFile = $this->isTwigInstalled() ? 'ControllerWithTwig.tpl.php' : 'Controller.tpl.php'; return [ __DIR__.'/../Resources/skeleton/controller/'.$skeletonFile => 'src/Controller/'.$params['controller_class_name'].'.php', diff --git a/src/Maker/MakeEntity.php b/src/Maker/MakeEntity.php index 4efe65f9c..d45776e8e 100644 --- a/src/Maker/MakeEntity.php +++ b/src/Maker/MakeEntity.php @@ -63,8 +63,8 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/doctrine/Entity.php.txt' => 'src/Entity/'.$params['entity_class_name'].'.php', - __DIR__.'/../Resources/skeleton/doctrine/Repository.php.txt' => 'src/Repository/'.$params['repository_class_name'].'.php', + __DIR__.'/../Resources/skeleton/doctrine/Entity.tpl.php' => 'src/Entity/'.$params['entity_class_name'].'.php', + __DIR__.'/../Resources/skeleton/doctrine/Repository.tpl.php' => 'src/Repository/'.$params['repository_class_name'].'.php', ]; } diff --git a/src/Maker/MakeForm.php b/src/Maker/MakeForm.php index ea66bf9f7..62f95069b 100644 --- a/src/Maker/MakeForm.php +++ b/src/Maker/MakeForm.php @@ -62,7 +62,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/form/Type.php.txt' => 'src/Form/'.$params['form_class_name'].'.php', + __DIR__.'/../Resources/skeleton/form/Type.tpl.php' => 'src/Form/'.$params['form_class_name'].'.php', ]; } diff --git a/src/Maker/MakeFunctionalTest.php b/src/Maker/MakeFunctionalTest.php index a817504a6..b34350590 100644 --- a/src/Maker/MakeFunctionalTest.php +++ b/src/Maker/MakeFunctionalTest.php @@ -58,7 +58,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/test/Functional.php.txt' => 'tests/'.$params['test_class_name'].'.php', + __DIR__.'/../Resources/skeleton/test/Functional.tpl.php' => 'tests/'.$params['test_class_name'].'.php', ]; } diff --git a/src/Maker/MakeSerializerEncoder.php b/src/Maker/MakeSerializerEncoder.php index 19113ce71..a70e103e0 100644 --- a/src/Maker/MakeSerializerEncoder.php +++ b/src/Maker/MakeSerializerEncoder.php @@ -61,7 +61,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/serializer/Encoder.php.txt' => 'src/Serializer/'.$params['encoder_class_name'].'.php', + __DIR__.'/../Resources/skeleton/serializer/Encoder.tpl.php' => 'src/Serializer/'.$params['encoder_class_name'].'.php', ]; } diff --git a/src/Maker/MakeSubscriber.php b/src/Maker/MakeSubscriber.php index 9ebfb8cf5..f1da505c6 100644 --- a/src/Maker/MakeSubscriber.php +++ b/src/Maker/MakeSubscriber.php @@ -85,14 +85,14 @@ public function getParameters(InputInterface $input): array 'event' => $event, 'eventArg' => $eventShortName ? sprintf('%s $event', $eventShortName) : '$event', 'methodName' => Str::asEventMethod($event), - 'eventUseStatement' => $eventClass ? sprintf("use $eventClass;\n") : '', + 'eventClass' => $eventClass, ]; } public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/event/Subscriber.php.txt' => 'src/EventSubscriber/'.$params['subscriber_class_name'].'.php', + __DIR__.'/../Resources/skeleton/event/Subscriber.tpl.php' => 'src/EventSubscriber/'.$params['subscriber_class_name'].'.php', ]; } diff --git a/src/Maker/MakeTwigExtension.php b/src/Maker/MakeTwigExtension.php index 9228f47a5..34d393664 100644 --- a/src/Maker/MakeTwigExtension.php +++ b/src/Maker/MakeTwigExtension.php @@ -59,7 +59,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/twig/Extension.php.txt' => 'src/Twig/'.$params['extension_class_name'].'.php', + __DIR__.'/../Resources/skeleton/twig/Extension.tpl.php' => 'src/Twig/'.$params['extension_class_name'].'.php', ]; } diff --git a/src/Maker/MakeUnitTest.php b/src/Maker/MakeUnitTest.php index 450de5d40..2647a755e 100644 --- a/src/Maker/MakeUnitTest.php +++ b/src/Maker/MakeUnitTest.php @@ -58,7 +58,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/test/Unit.php.txt' => 'tests/'.$params['test_class_name'].'.php', + __DIR__.'/../Resources/skeleton/test/Unit.tpl.php' => 'tests/'.$params['test_class_name'].'.php', ]; } diff --git a/src/Maker/MakeValidator.php b/src/Maker/MakeValidator.php index 690f16b91..18f282ff5 100644 --- a/src/Maker/MakeValidator.php +++ b/src/Maker/MakeValidator.php @@ -61,8 +61,8 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/validator/Validator.php.txt' => 'src/Validator/Constraints/'.$params['validator_class_name'].'.php', - __DIR__.'/../Resources/skeleton/validator/Constraint.php.txt' => 'src/Validator/Constraints/'.$params['constraint_class_name'].'.php', + __DIR__.'/../Resources/skeleton/validator/Validator.tpl.php' => 'src/Validator/Constraints/'.$params['validator_class_name'].'.php', + __DIR__.'/../Resources/skeleton/validator/Constraint.tpl.php' => 'src/Validator/Constraints/'.$params['constraint_class_name'].'.php', ]; } diff --git a/src/Maker/MakeVoter.php b/src/Maker/MakeVoter.php index 1346cdb7b..2f72735ac 100644 --- a/src/Maker/MakeVoter.php +++ b/src/Maker/MakeVoter.php @@ -59,7 +59,7 @@ public function getParameters(InputInterface $input): array public function getFiles(array $params): array { return [ - __DIR__.'/../Resources/skeleton/security/Voter.php.txt' => 'src/Security/Voter/'.$params['voter_class_name'].'.php', + __DIR__.'/../Resources/skeleton/security/Voter.tpl.php' => 'src/Security/Voter/'.$params['voter_class_name'].'.php', ]; } diff --git a/src/MakerInterface.php b/src/MakerInterface.php index 19cd522b7..4f3b09492 100644 --- a/src/MakerInterface.php +++ b/src/MakerInterface.php @@ -71,9 +71,11 @@ public function getParameters(InputInterface $input): array; * For example: * * return array( - * __DIR__.'/../Resources/skeleton/command/Command.php.txt' => 'src/Command/'.$params['command_class_name'].'.php', + * __DIR__.'/../Resources/skeleton/command/Command.tpl.php' => 'src/Command/'.$params['command_class_name'].'.php', * ); * + * These files are parsed as PHP. + * * @param array $params The parameters returned from getParameters() * * @return array diff --git a/src/Resources/skeleton/authenticator/Empty.php.txt b/src/Resources/skeleton/authenticator/Empty.tpl.php similarity index 84% rename from src/Resources/skeleton/authenticator/Empty.php.txt rename to src/Resources/skeleton/authenticator/Empty.tpl.php index 73f8ca60e..8d15b4224 100644 --- a/src/Resources/skeleton/authenticator/Empty.php.txt +++ b/src/Resources/skeleton/authenticator/Empty.tpl.php @@ -1,4 +1,4 @@ - namespace App\Security; @@ -9,45 +9,45 @@ use Symfony\Component\Security\Core\User\UserProviderInterface; use Symfony\Component\Security\Guard\GuardAuthenticator; -class {{ class_name }} extends GuardAuthenticator +class extends GuardAuthenticator { public function supports(Request $request) { - + // todo } public function getCredentials(Request $request) { - + // todo } public function getUser($credentials, UserProviderInterface $userProvider) { - + // todo } public function checkCredentials($credentials, UserInterface $user) { - + // todo } public function onAuthenticationFailure(Request $request, AuthenticationException $exception) { - + // todo } public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey) { - + // todo } - public function supportsRememberMe() + public function start(Request $request, AuthenticationException $authException = null) { - + // todo } - public function start(Request $request, AuthenticationException $authException = null) + public function supportsRememberMe() { - + // todo } -} \ No newline at end of file +} diff --git a/src/Resources/skeleton/command/Command.php.txt b/src/Resources/skeleton/command/Command.tpl.php similarity index 88% rename from src/Resources/skeleton/command/Command.php.txt rename to src/Resources/skeleton/command/Command.tpl.php index 9ba8cb9b3..dc5ef7513 100644 --- a/src/Resources/skeleton/command/Command.php.txt +++ b/src/Resources/skeleton/command/Command.tpl.php @@ -1,4 +1,4 @@ - namespace App\Command; @@ -9,9 +9,9 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; -class {{ command_class_name }} extends Command +class extends Command { - protected static $defaultName = '{{ command_name }}'; + protected static $defaultName = ''; protected function configure() { diff --git a/src/Resources/skeleton/controller/Controller.php.txt b/src/Resources/skeleton/controller/Controller.tpl.php similarity index 69% rename from src/Resources/skeleton/controller/Controller.php.txt rename to src/Resources/skeleton/controller/Controller.tpl.php index fbeba37e7..50770e05f 100644 --- a/src/Resources/skeleton/controller/Controller.php.txt +++ b/src/Resources/skeleton/controller/Controller.tpl.php @@ -1,4 +1,4 @@ - namespace App\Controller; @@ -6,10 +6,10 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -class {{ controller_class_name }} extends AbstractController +class extends AbstractController { /** - * @Route("{{ route_path }}", name="{{ route_name }}") + * @Route("", name="") */ public function index() { diff --git a/src/Resources/skeleton/controller/ControllerWithTwig.php.txt b/src/Resources/skeleton/controller/ControllerWithTwig.tpl.php similarity index 76% rename from src/Resources/skeleton/controller/ControllerWithTwig.php.txt rename to src/Resources/skeleton/controller/ControllerWithTwig.tpl.php index 7e1b60873..5c44126f2 100644 --- a/src/Resources/skeleton/controller/ControllerWithTwig.php.txt +++ b/src/Resources/skeleton/controller/ControllerWithTwig.tpl.php @@ -1,4 +1,4 @@ - namespace App\Controller; @@ -6,10 +6,10 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; -class {{ controller_class_name }} extends AbstractController +class extends AbstractController { /** - * @Route("{{ route_path }}", name="{{ route_name }}") + * @Route("", name="") */ public function index() { diff --git a/src/Resources/skeleton/doctrine/Entity.php.txt b/src/Resources/skeleton/doctrine/Entity.tpl.php similarity index 60% rename from src/Resources/skeleton/doctrine/Entity.php.txt rename to src/Resources/skeleton/doctrine/Entity.tpl.php index d497ff374..e82796a8c 100644 --- a/src/Resources/skeleton/doctrine/Entity.php.txt +++ b/src/Resources/skeleton/doctrine/Entity.tpl.php @@ -1,13 +1,13 @@ - namespace App\Entity; use Doctrine\ORM\Mapping as ORM; /** - * @ORM\Entity(repositoryClass="App\Repository\{{ repository_class_name }}") + * @ORM\Entity(repositoryClass="App\Repository\") */ -class {{ entity_class_name }} +class { /** * @ORM\Id diff --git a/src/Resources/skeleton/doctrine/Repository.php.txt b/src/Resources/skeleton/doctrine/Repository.php.txt deleted file mode 100644 index 6b84218b7..000000000 --- a/src/Resources/skeleton/doctrine/Repository.php.txt +++ /dev/null @@ -1,28 +0,0 @@ -createQueryBuilder('{{ entity_alias }}') - ->where('{{ entity_alias }}.something = :value')->setParameter('value', $value) - ->orderBy('{{ entity_alias }}.id', 'ASC') - ->setMaxResults(10) - ->getQuery() - ->getResult() - ; - } - */ -} diff --git a/src/Resources/skeleton/doctrine/Repository.tpl.php b/src/Resources/skeleton/doctrine/Repository.tpl.php new file mode 100644 index 000000000..de0d82ec6 --- /dev/null +++ b/src/Resources/skeleton/doctrine/Repository.tpl.php @@ -0,0 +1,28 @@ + + +namespace App\Repository; + +use App\Entity\; +use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Symfony\Bridge\Doctrine\RegistryInterface; + +class extends ServiceEntityRepository +{ + public function __construct(RegistryInterface $registry) + { + parent::__construct($registry, ::class); + } + + /* + public function findBySomething($value) + { + return $this->createQueryBuilder('') + ->where('.something = :value')->setParameter('value', $value) + ->orderBy('.id', 'ASC') + ->setMaxResults(10) + ->getQuery() + ->getResult() + ; + } + */ +} diff --git a/src/Resources/skeleton/event/Subscriber.php.txt b/src/Resources/skeleton/event/Subscriber.php.txt deleted file mode 100644 index 8438a1f77..000000000 --- a/src/Resources/skeleton/event/Subscriber.php.txt +++ /dev/null @@ -1,20 +0,0 @@ - '{{ methodName }}', - ]; - } -} diff --git a/src/Resources/skeleton/event/Subscriber.tpl.php b/src/Resources/skeleton/event/Subscriber.tpl.php new file mode 100644 index 000000000..81dcf79e7 --- /dev/null +++ b/src/Resources/skeleton/event/Subscriber.tpl.php @@ -0,0 +1,21 @@ + + +namespace App\EventSubscriber; + +use Symfony\Component\EventDispatcher\EventSubscriberInterface; + + +class implements EventSubscriberInterface +{ + public function () + { + // ... + } + + public static function getSubscribedEvents() + { + return [ + '' => '', + ]; + } +} diff --git a/src/Resources/skeleton/form/Type.php.txt b/src/Resources/skeleton/form/Type.tpl.php similarity index 74% rename from src/Resources/skeleton/form/Type.php.txt rename to src/Resources/skeleton/form/Type.tpl.php index 1bbb315f6..679e61d43 100644 --- a/src/Resources/skeleton/form/Type.php.txt +++ b/src/Resources/skeleton/form/Type.tpl.php @@ -1,13 +1,13 @@ - namespace App\Form; -use App\Entity\{{ entity_class_name }}; +use App\Entity\; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; -class {{ form_class_name }} extends AbstractType +class extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) { @@ -20,7 +20,7 @@ public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ // uncomment if you want to bind to a class - //'data_class' => {{ entity_class_name }}::class, + //'data_class' => ::class, ]); } } diff --git a/src/Resources/skeleton/security/Voter.php.txt b/src/Resources/skeleton/security/Voter.tpl.php similarity index 95% rename from src/Resources/skeleton/security/Voter.php.txt rename to src/Resources/skeleton/security/Voter.tpl.php index f747d9f84..6cae4d823 100644 --- a/src/Resources/skeleton/security/Voter.php.txt +++ b/src/Resources/skeleton/security/Voter.tpl.php @@ -1,4 +1,4 @@ - namespace App\Security\Voter; @@ -6,7 +6,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\Voter; use Symfony\Component\Security\Core\User\UserInterface; -class {{ voter_class_name }} extends Voter +class extends Voter { protected function supports($attribute, $subject) { diff --git a/src/Resources/skeleton/serializer/Encoder.php.txt b/src/Resources/skeleton/serializer/Encoder.tpl.php similarity index 81% rename from src/Resources/skeleton/serializer/Encoder.php.txt rename to src/Resources/skeleton/serializer/Encoder.tpl.php index 636a69895..a8321a926 100644 --- a/src/Resources/skeleton/serializer/Encoder.php.txt +++ b/src/Resources/skeleton/serializer/Encoder.tpl.php @@ -1,14 +1,14 @@ - namespace App\Serializer; use Symfony\Component\Serializer\Encoder\DecoderInterface; use Symfony\Component\Serializer\Encoder\EncoderInterface; -class {{ encoder_class_name }} implements EncoderInterface, DecoderInterface +class implements EncoderInterface, DecoderInterface { - public const FORMAT = '{{ format }}'; - + public const FORMAT = ''; + public function encode($data, $format, array $context = []) { // TODO: return your encoded data diff --git a/src/Resources/skeleton/test/Functional.php.txt b/src/Resources/skeleton/test/Functional.tpl.php similarity index 85% rename from src/Resources/skeleton/test/Functional.php.txt rename to src/Resources/skeleton/test/Functional.tpl.php index 506768128..20b4c55e8 100644 --- a/src/Resources/skeleton/test/Functional.php.txt +++ b/src/Resources/skeleton/test/Functional.tpl.php @@ -1,10 +1,10 @@ - namespace App\Tests; use Symfony\Bundle\FrameworkBundle\Test\WebTestCase; -class {{ test_class_name }} extends WebTestCase +class extends WebTestCase { public function testSomething() { diff --git a/src/Resources/skeleton/test/Unit.php.txt b/src/Resources/skeleton/test/Unit.tpl.php similarity index 68% rename from src/Resources/skeleton/test/Unit.php.txt rename to src/Resources/skeleton/test/Unit.tpl.php index 5e2591c40..0fbbc7afb 100644 --- a/src/Resources/skeleton/test/Unit.php.txt +++ b/src/Resources/skeleton/test/Unit.tpl.php @@ -1,10 +1,10 @@ - namespace App\Tests; use PHPUnit\Framework\TestCase; -class {{ test_class_name }} extends TestCase +class extends TestCase { public function testSomething() { diff --git a/src/Resources/skeleton/twig/Extension.php.txt b/src/Resources/skeleton/twig/Extension.tpl.php similarity index 86% rename from src/Resources/skeleton/twig/Extension.php.txt rename to src/Resources/skeleton/twig/Extension.tpl.php index 69982e081..11952dd3c 100644 --- a/src/Resources/skeleton/twig/Extension.php.txt +++ b/src/Resources/skeleton/twig/Extension.tpl.php @@ -1,4 +1,4 @@ - namespace App\Twig; @@ -6,7 +6,7 @@ use Twig\TwigFilter; use Twig\TwigFunction; -class {{ extension_class_name }} extends AbstractExtension +class extends AbstractExtension { public function getFilters(): array { diff --git a/src/Resources/skeleton/validator/Constraint.php.txt b/src/Resources/skeleton/validator/Constraint.tpl.php similarity index 81% rename from src/Resources/skeleton/validator/Constraint.php.txt rename to src/Resources/skeleton/validator/Constraint.tpl.php index 47aacdf1f..bed41df83 100644 --- a/src/Resources/skeleton/validator/Constraint.php.txt +++ b/src/Resources/skeleton/validator/Constraint.tpl.php @@ -1,4 +1,4 @@ - namespace App\Validator\Constraints; @@ -7,7 +7,7 @@ /** * @Annotation */ -class {{ constraint_class_name }} extends Constraint +class extends Constraint { /* * Any public properties become valid options for the annotation. diff --git a/src/Resources/skeleton/validator/Validator.php.txt b/src/Resources/skeleton/validator/Validator.tpl.php similarity index 71% rename from src/Resources/skeleton/validator/Validator.php.txt rename to src/Resources/skeleton/validator/Validator.tpl.php index 51931098b..3b9dfcd72 100644 --- a/src/Resources/skeleton/validator/Validator.php.txt +++ b/src/Resources/skeleton/validator/Validator.tpl.php @@ -1,15 +1,15 @@ - namespace App\Validator\Constraints; use Symfony\Component\Validator\Constraint; use Symfony\Component\Validator\ConstraintValidator; -class {{ validator_class_name }} extends ConstraintValidator +class extends ConstraintValidator { public function validate($value, Constraint $constraint) { - /** @var $constraint {{ constraint_class_name }} */ + /* @var $constraint */ $this->context->buildViolation($constraint->message) ->setParameter('{{ value }}', $value) diff --git a/tests/Command/FunctionalTest.php b/tests/Command/FunctionalTest.php index 9c00fe7d1..0f4247186 100644 --- a/tests/Command/FunctionalTest.php +++ b/tests/Command/FunctionalTest.php @@ -71,10 +71,10 @@ public function testCommands(MakerInterface $maker, array $inputs) $files = $this->parsePHPFiles($tester->getDisplay()); foreach ($files as $file) { - $process = new Process(sprintf('php -l %s', $file), $this->targetDir); + $process = new Process(sprintf('php vendor/bin/php-cs-fixer fix --dry-run --diff %s', $this->targetDir.'/'.$file), __DIR__.'/../../'); $process->run(); if (!$process->isSuccessful()) { - throw new \Exception(sprintf('File "%s" has a syntax error: %s', $file, $process->getOutput())); + throw new \Exception(sprintf('File "%s" has a php-cs problem: %s', $file, $process->getOutput())); } } }