Skip to content

Commit d5d8c7d

Browse files
committed
Merge branch '1.0' of https://github.com/Tactics/symfony1 into 1.0
2 parents 4a6221e + 0756d5e commit d5d8c7d

File tree

103 files changed

+1413
-1255
lines changed

Some content is hidden

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

103 files changed

+1413
-1255
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.idea/
22
vendor/
3-
composer.lock
3+
.env

composer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,12 @@
77
"name": "fabpot",
88
"email": "fabpot@sensio.com"
99
}
10-
]
10+
],
11+
"require": {
12+
"ext-dom": "*",
13+
"ext-json": "*",
14+
"ext-curl": "*",
15+
"ext-bcmath": "*",
16+
"ext-intl": "*"
17+
}
1118
}

composer.lock

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

data/data/exception.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
55
<title>symfony exception</title>
66
<style>
7-
body { margin: 0; padding: 20px; margin-top: 20px; background-color: #eee }
7+
body {
8+
padding: 20px;
9+
margin: 20px 0 0;
10+
background-color: #eee }
811
body, td, th { font: 11px Verdana, Arial, sans-serif; color: #333 }
912
a { color: #333 }
1013
h1 { margin: 0 0 0 10px; padding: 10px 0 10px 0; font-weight: bold; font-size: 120% }
@@ -19,7 +22,9 @@
1922
table.vars td { padding: 2px; font-family: monospace; white-space: pre }
2023
p.error { padding: 10px; background-color: #f00; font-weight: bold; text-align: center; -moz-border-radius: 10px; }
2124
p.error a { color: #fff }
22-
#main { padding: 20px; padding-left: 70px; border: 1px solid #ddd; background-color: #fff; text-align:left; -moz-border-radius: 10px; min-width: 13em; max-width: 52em }
25+
#main {
26+
padding: 20px 20px 20px 70px;
27+
border: 1px solid #ddd; background-color: #fff; text-align:left; -moz-border-radius: 10px; min-width: 13em; max-width: 52em }
2328
#message { padding: 10px; margin-bottom: 10px; background-color: #eee; -moz-border-radius: 10px }
2429
</style>
2530
<script type="text/javascript">

data/web/sf/calendar/skins/aqua/theme.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ div.calendar { position: relative; }
7474

7575
.calendar thead .active { /* Active (pressed) buttons in header */
7676
background: url("active-bg.gif"); color: #fff;
77-
padding: 3px 1px 0px 3px;
77+
padding: 3px 1px 0 3px;
7878
border-bottom: 1px solid #797979;
7979
}
8080

@@ -119,7 +119,7 @@ div.calendar { position: relative; }
119119
}
120120

121121
.calendar tbody td.active { /* Active (pressed) cells <TD> */
122-
padding: 2px 2px 0px 2px;
122+
padding: 2px 2px 0 2px;
123123
}
124124

125125
.calendar tbody td.weekend { /* Cells showing weekend days */
@@ -165,16 +165,16 @@ div.calendar { position: relative; }
165165

166166
.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
167167
background: #7c7;
168-
padding: 2px 0px 0px 2px;
168+
padding: 2px 0 0 2px;
169169
}
170170

171171
/* Combo boxes (menus that display months/years for direct selection) */
172172

173173
.calendar .combo {
174174
position: absolute;
175175
display: none;
176-
top: 0px;
177-
left: 0px;
176+
top: 0;
177+
left: 0;
178178
width: 4em;
179179
cursor: default;
180180
border-width: 0 1px 1px 1px;
@@ -206,15 +206,15 @@ div.calendar { position: relative; }
206206

207207
.calendar td.time {
208208
border-top: 1px solid #797979;
209-
padding: 1px 0px;
209+
padding: 1px 0;
210210
text-align: center;
211211
background: url("dark-bg.gif");
212212
}
213213

214214
.calendar td.time .hour,
215215
.calendar td.time .minute,
216216
.calendar td.time .ampm {
217-
padding: 0px 5px 0px 6px;
217+
padding: 0 5px 0 6px;
218218
font-weight: bold;
219219
background: url("normal-bg.gif"); color: #000;
220220
}
@@ -229,7 +229,7 @@ div.calendar { position: relative; }
229229
}
230230

231231
.calendar td.time .colon {
232-
padding: 0px 2px 0px 3px;
232+
padding: 0 2px 0 3px;
233233
font-weight: bold;
234234
}
235235

data/web/sf/sf_admin/css/main.css

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@
4141
#sf_admin_container h1
4242
{
4343
margin: 8px 0;
44-
padding: 3px;
45-
padding-left: 0px;
46-
color: #555;
44+
padding: 3px 3px 3px 0px;
45+
color: #555;
4746
font-family: "Trebuchet MS", Arial, Verdana, sans-serif;
4847
font-size: 25px;
4948
}
@@ -161,7 +160,7 @@
161160
{
162161
margin-bottom: 3px;
163162
border: 1px solid #ddd;
164-
border-bottom: 0px;
163+
border-bottom: 0;
165164
background-color: #fff;
166165
}
167166

@@ -216,10 +215,9 @@
216215
color: #333;
217216
font-size: 11px;
218217
font-family: Arial, sans-serif;
219-
border: 0px;
218+
border: 0;
220219
border-right: 4px solid #999;
221220
background-color: #ffc;
222-
cursor: hand;
223221
cursor: pointer;
224222
}
225223

@@ -287,8 +285,8 @@
287285
{
288286
width: 100%;
289287
border: 1px solid #ddd;
290-
border-bottom: 0px;
291-
border-right: 0px;
288+
border-bottom: 0;
289+
border-right: 0;
292290
}
293291

294292
#sf_admin_container .sf_admin_list th
@@ -317,7 +315,7 @@
317315

318316
#sf_admin_container .sf_admin_row_0 td
319317
{
320-
318+
321319
}
322320

323321
#sf_admin_container .sf_admin_row_1 td
@@ -332,7 +330,7 @@
332330

333331
#sf_admin_container .mceEditor td
334332
{
335-
padding: 0px;
333+
padding: 0;
336334
}
337335

338336
#sf_admin_container select.sf_admin_multiple, #sf_admin_container select.sf_admin_multiple-selected

0 commit comments

Comments
 (0)