Skip to content

Commit d5fd873

Browse files
authored
Merge pull request #140 from sadikoff/superfast-tests
[WIP - Experimental] Superfast tests
2 parents 237214e + c1ca8bc commit d5fd873

File tree

11 files changed

+546
-379
lines changed

11 files changed

+546
-379
lines changed

.appveyor/composer.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ install:
2323
- composer --prefer-dist install
2424
- ./vendor/bin/simple-phpunit install
2525

26+
before_script:
27+
- phpenv config-rm xdebug.ini
28+
2629
script:
2730
- ./vendor/bin/simple-phpunit
2831
- ./vendor/bin/php-cs-fixer fix --dry-run

appveyor.yml

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,63 @@
11
build: false
2+
platform:
3+
- x64
24
clone_folder: c:\projects\maker-bundle
35

46
cache:
7+
- '%LOCALAPPDATA%\Composer\files -> composer.lock'
58
- composer.phar
9+
# Cache chocolatey packages
10+
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
11+
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
12+
# Cache php install
13+
- C:\tools\php -> .appveyor.yml
614
- .phpunit -> phpunit
15+
- C:\projects\maker-bundle\vendor -> composer.json
16+
17+
services:
18+
- mysql
719

820
init:
9-
- SET PATH=c:\php;%PATH%
21+
- SET PATH=C:\Program Files\OpenSSL;C:\tools\php;%PATH%
22+
- SET COMPOSER_NO_INTERACTION=1
23+
- SET PHP=0 # This var is connected to PHP install cache
24+
- SET ANSICON=121x90 (121x90)
1025

1126
environment:
12-
TEST_DATABASE_DSN: sqlite:///c:\projects\maker-bundle\tests\tmp\app.db
27+
TEST_DATABASE_DSN: mysql://root:[email protected]:3306/test_maker
28+
matrix:
29+
- dependencies: lowest
30+
php_ver_target: 7.1.3
31+
- dependencies: highest
32+
php_ver_target: 7.2.3
1333

1434
install:
15-
- mkdir c:\php && cd c:\php
16-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
17-
- 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul
18-
- cd ext
19-
- appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-5.1.8-7.1-ts-vc14-x86.zip
20-
- 7z x php_apcu-5.1.8-7.1-ts-vc14-x86.zip -y >nul
21-
- cd ..
22-
- copy /Y php.ini-development php.ini-min
23-
- echo memory_limit=-1 >> php.ini-min
24-
- echo serialize_precision=14 >> php.ini-min
25-
- echo max_execution_time=1200 >> php.ini-min
26-
- echo date.timezone="America/Los_Angeles" >> php.ini-min
27-
- echo extension_dir=ext >> php.ini-min
28-
- copy /Y php.ini-min php.ini-max
29-
- echo zend_extension=php_opcache.dll >> php.ini-max
30-
- echo opcache.enable_cli=1 >> php.ini-max
31-
- echo extension=php_openssl.dll >> php.ini-max
32-
- echo extension=php_apcu.dll >> php.ini-max
33-
- echo apc.enable_cli=1 >> php.ini-max
34-
- echo extension=php_intl.dll >> php.ini-max
35-
- echo extension=php_mbstring.dll >> php.ini-max
36-
- echo extension=php_fileinfo.dll >> php.ini-max
37-
- echo extension=php_pdo_sqlite.dll >> php.ini-max
38-
- echo extension=php_curl.dll >> php.ini-max
39-
- copy /Y php.ini-max php.ini
40-
41-
- cd c:\php
42-
- IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.6.3/composer.phar)
43-
- php composer.phar self-update
44-
# copy instead of using echo because appveyor does not allow "%s" characters
45-
- copy /Y c:\projects\maker-bundle\.appveyor\composer.bat composer.bat
46-
47-
- cd c:\projects\maker-bundle
48-
- php -dmemory_limit=-1 c:\php\composer.phar install --no-progress --no-suggest --ansi
49-
- composer dump-autoload
50-
- ./vendor/bin/simple-phpunit install
35+
- ps: Set-Service wuauserv -StartupType Manual
36+
- IF EXIST C:\tools\php (SET PHP=1) # Checks for the PHP install being cached
37+
- IF %PHP%==0 cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version %php_ver_target%
38+
- cd C:\tools\php
39+
- IF %PHP%==0 copy php.ini-development php.ini /Y
40+
- IF %PHP%==0 echo memory_limit=-1 >> php.ini
41+
- IF %PHP%==0 echo serialize_precision=14 >> php.ini
42+
- IF %PHP%==0 echo max_execution_time=1200 >> php.ini
43+
- IF %PHP%==0 echo date.timezone="UTC" >> php.ini
44+
- IF %PHP%==0 echo extension_dir=ext >> php.ini
45+
- IF %PHP%==0 echo zend_extension=php_opcache.dll >> php.ini
46+
- IF %PHP%==0 echo opcache.enable_cli=1 >> php.ini
47+
- IF %PHP%==0 echo extension=php_openssl.dll >> php.ini
48+
- IF %PHP%==0 echo extension=php_mbstring.dll >> php.ini
49+
- IF %PHP%==0 echo extension=php_fileinfo.dll >> php.ini
50+
- IF %PHP%==0 echo extension=php_mysqli.dll >> php.ini
51+
- IF %PHP%==0 echo extension=php_curl.dll >> php.ini
52+
- IF %PHP%==0 echo extension=php_pdo_mysql.dll >> php.ini
53+
- IF %PHP%==0 echo @php %%~dp0composer.phar %%* > composer.bat
54+
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
55+
- composer global require hirak/prestissimo --no-progress
56+
- cd C:\projects\maker-bundle
57+
- IF %dependencies%==lowest appveyor-retry composer update --prefer-lowest --no-progress --no-suggest --ansi
58+
- IF %dependencies%==highest appveyor-retry composer update --no-progress --no-suggest --ansi
59+
- vendor/bin/simple-phpunit install
5160

5261
test_script:
53-
- ./vendor/bin/simple-phpunit --group=functional_group1
54-
- ./vendor/bin/simple-phpunit --group=functional_group2
55-
- ./vendor/bin/simple-phpunit --exclude-group=functional_group1,functional_group2
62+
- cd C:\projects\maker-bundle
63+
- vendor/bin/simple-phpunit

src/Maker/MakeController.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
7575
'templates/'.$templateName,
7676
'controller/twig_template.tpl.php',
7777
[
78-
'base_layout_exists' => $this->fileManager->fileExists('templates/base.html.twig'),
7978
'controller_path' => $controllerPath,
8079
]
8180
);

src/Resources/skeleton/controller/twig_template.tpl.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
<?php if ($base_layout_exists): ?>
2-
{% extends 'base.html.twig' %}
3-
4-
{% block title %}Hello {{ controller_name }}!{% endblock %}
5-
<?php else: ?>
6-
<!DOCTYPE html>
7-
8-
<title>Hello {{ controller_name }}!</title>
9-
<?php endif; ?>
1+
<?= $helper->getHeadPrintCode('Hello {{ controller_name }}!'); ?>
102

113
{% block body %}
124
<style>

0 commit comments

Comments
 (0)