Commit 8e715fc

author

Kevin Auvinet

authored

Merge pull request #1 from ke20/updates

add multi updates: composer, phpunit, doctrine, tests and default page

2 parents c8efcd3 + e352633 commit 8e715fcCopy full SHA for 8e715fc

File tree

+2804

-635

lines changed

+2804

-635

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,14 @@`
`4`	`4`
`5`	`5`	`###> symfony/framework-bundle ###`
`6`	`6`	`APP_ENV=dev`
`7`		`-APP_DEBUG=1`
`8`		`-APP_SECRET=66d912e7b25e3f9fdb9377472a524127`
	`7`	`+APP_SECRET=36fb46b50d0aa2bcba16daa1c3d84055`
	`8`	`+#TRUSTED_PROXIES=127.0.0.1,127.0.0.2`
	`9`	`+#TRUSTED_HOSTS=localhost,example.com`
`9`	`10`	`###< symfony/framework-bundle ###`
	`11`	`+`
	`12`	`+###> doctrine/doctrine-bundle ###`
	`13`	`+# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url`
	`14`	`+# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"`
	`15`	`+# Configure your db driver and server_version in config/packages/doctrine.yaml`
	`16`	`+DATABASE_URL=mysql://db_user:db_password@127.0.0.1:3306/db_name`
	`17`	`+###< doctrine/doctrine-bundle ###`

Lines changed: 2 additions & 1 deletion

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,12 @@ if (!file_exists(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-php`
`5`	`5`	echo "Unable to find the `simple-phpunit` script in `vendor/symfony/phpunit-bridge/bin/`.\n";
`6`	`6`	`exit(1);`
`7`	`7`	`}`
	`8`	`+if (false === getenv('SYMFONY_DEPRECATIONS_HELPER')) {`
	`9`	`+ // see https://symfony.com/doc/current/components/phpunit_bridge.html#making-tests-fail`
	`10`	`+ putenv('SYMFONY_DEPRECATIONS_HELPER=999999');`
	`11`	`+}`
`8`	`12`	`if (false === getenv('SYMFONY_PHPUNIT_REMOVE')) {`
`9`		`- putenv('SYMFONY_PHPUNIT_REMOVE=symfony/yaml');`
	`13`	`+ putenv('SYMFONY_PHPUNIT_REMOVE=');`
`10`	`14`	`}`
`11`	`15`	`if (false === getenv('SYMFONY_PHPUNIT_VERSION')) {`
`12`	`16`	`putenv('SYMFONY_PHPUNIT_VERSION=6.5');`

Lines changed: 9 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,18 @@`
`4`	`4`	`"type": "project",`
`5`	`5`	`"license": "proprietary",`
`6`	`6`	`"require": {`
`7`		`- "php": "^7.0.8",`
	`7`	`+ "php": "^7.2",`
	`8`	`+ "doctrine/doctrine-bundle": "^1.6.10",`
	`9`	`+ "doctrine/doctrine-migrations-bundle": "^1.3",`
	`10`	`+ "doctrine/orm": "^2.5.11",`
`8`	`11`	`"symfony/console": "^4.1",`
`9`		`- "symfony/flex": "^1.0",`
	`12`	`+ "symfony/flex": "^1.1",`
`10`	`13`	`"symfony/framework-bundle": "^4.1",`
	`14`	`+ "symfony/twig-bundle": "^4.1",`
`11`	`15`	`"symfony/yaml": "^4.1"`
`12`	`16`	`},`
`13`	`17`	`"require-dev": {`
	`18`	`+ "symfony/browser-kit": "^4.1",`
`14`	`19`	`"symfony/dotenv": "^4.1",`
`15`	`20`	`"symfony/phpunit-bridge": "^4.1"`
`16`	`21`	`},`
`@@ -32,8 +37,9 @@`
`32`	`37`	`},`
`33`	`38`	`"scripts": {`
`34`	`39`	`"auto-scripts": {`
	`40`	`+ "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd",`
`35`	`41`	`"cache:clear": "symfony-cmd",`
`36`		`- "assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"`
	`42`	`+ "assets:install %PUBLIC_DIR%": "symfony-cmd"`
`37`	`43`	`},`
`38`	`44`	`"post-install-cmd": [`
`39`	`45`	`"@auto-scripts"`

Comments

(0)