Skip to content

Commit 91ac58d

Browse files
authored
Merge branch '1.0' into php7.3
2 parents d3f8c9a + 8ccfb37 commit 91ac58d

File tree

149 files changed

+6209
-1851
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+6209
-1851
lines changed

.ahoy.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
ahoyapi: v2
2+
commands:
3+
ps:
4+
cmd: docker-compose ps "$@"
5+
usage: List containers.
6+
7+
start:
8+
cmd: docker-compose start "$@"
9+
usage: Start services.
10+
11+
stop:
12+
cmd: docker-compose stop "$@"
13+
usage: Stop services.
14+
15+
restart:
16+
cmd: docker-compose restart "$@"
17+
usage: Restart services.
18+
19+
up:
20+
cmd: docker-compose up -d "$@"
21+
usage: Create and start containers.
22+
23+
down:
24+
cmd: docker-compose down "$@"
25+
usage: Stop and remove containers, networks, images, and volumes.
26+
27+
composer:
28+
cmd: docker-compose run -w /var/www/html composer composer "$@"
29+
usage: Run Composer commands in the composer container.
30+
31+
shell:
32+
cmd: docker-compose run -w /var/www/html/web php /bin/sh "$@"
33+
usage: Run shell commands in the php service container.
34+
35+
symfony:
36+
cmd: docker-compose run -w /var/www/html php ./symfony "$@"
37+
usage: Run Symfony commands in the php service container.
38+
39+
rector:
40+
cmd: docker-compose run -w /var/www/html php vendor/bin/rector "$@"
41+
usage: Run rector.
42+

.editorconfig

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
; This file is for unifying the coding style for different editors and IDEs.
2+
; More information at http://editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
# Change line ending to LF again after whole team is set up with correct line endings.
8+
end_of_line = LF
9+
indent_style = space
10+
indent_size = 4
11+
insert_final_newline = true
12+
trim_trailing_whitespace = true
13+
# Change to utf-8 after migration to linux and fixes in code.
14+
charset = utf-8
15+
16+
[*.bat]
17+
end_of_line = crlf
18+
19+
[*.yml]
20+
indent_size = 2
21+

.env

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file is a "template" of which env vars need to be defined for your application
2+
# Copy this file to .env file for development, create environment variables when deploying to production
3+
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
4+
5+
###> Docker setup ###
6+
DOCKER_PROJECT_URL=symfony.test
7+
DOCKER_PROJECT_NAME=symfony
8+
###< Docker setup ###

.env.dist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file is a "template" of which env vars need to be defined for your application
2+
# Copy this file to .env file for development, create environment variables when deploying to production
3+
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
4+
5+
###> Docker setup ###
6+
DOCKER_PROJECT_URL=symfony.test
7+
DOCKER_PROJECT_NAME=symfony
8+
###< Docker setup ###

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
.idea/
2+
vendor/
3+
.env

composer.json

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
{
2-
"name": "symfony",
2+
"name": "tactics/symfony",
3+
"description": "The Tactics fork of symfony 1",
34
"license": "MIT",
45
"authors": [
56
{
67
"name": "fabpot",
78
"email": "[email protected]"
89
}
910
],
10-
"require": {}
11+
"require": {
12+
"ext-dom": "*",
13+
"ext-json": "*",
14+
"ext-curl": "*",
15+
"ext-bcmath": "*",
16+
"ext-intl": "*"
17+
},
18+
"require-dev": {
19+
"rector/rector": "^0.8.56"
20+
},
21+
"scripts": {
22+
"rector:dryrun": "./vendor/bin/rector process --config rector.php --dry-run",
23+
"rector": "./vendor/bin/rector process --config rector.php"
24+
}
1125
}

0 commit comments

Comments
 (0)