Skip to content

Commit cdf2622

Browse files
committed
Merge branch 'qa' into stage
2 parents 5696a98 + 05c06fb commit cdf2622

File tree

443 files changed

+43184
-288
lines changed

Some content is hidden

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

443 files changed

+43184
-288
lines changed

.editorconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
root = true
55

66
[*]
7-
indent_style = space
7+
indent_style = tab
88
indent_size = 4
99
end_of_line = lf
1010
insert_final_newline = true
@@ -14,5 +14,5 @@ trim_trailing_whitespace = true
1414
end_of_line = crlf
1515

1616
[*.yml]
17-
indent_style = space
17+
indent_style = tab
1818
indent_size = 2

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@
3434
*.mo binary
3535
*.pdf binary
3636
*.phar binary
37+
*.eot binary
38+
*.ttf binary

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
/config/app.php
33
/tmp/*
44
/logs/*
5+
/webroot/cache_css/*
6+
/webroot/cache_js/*
7+
/files/*
8+
/plugins/Showcase

composer.json

Lines changed: 54 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,56 @@
11
{
2-
"name": "cakephp/app",
3-
"description": "CakePHP skeleton app",
4-
"homepage": "http://cakephp.org",
5-
"type": "project",
6-
"license": "MIT",
7-
"require": {
8-
"php": ">=5.5.9",
9-
"cakephp/cakephp": "~3.2",
10-
"mobiledetect/mobiledetectlib": "2.*",
11-
"cakephp/migrations": "~1.0",
12-
"cakephp/plugin-installer": "*"
13-
},
14-
"require-dev": {
15-
"psy/psysh": "@stable",
16-
"cakephp/debug_kit": "~3.2",
17-
"cakephp/bake": "~1.1"
18-
},
19-
"suggest": {
20-
"phpunit/phpunit": "Allows automated tests to be run without system-wide install.",
21-
"cakephp/cakephp-codesniffer": "Allows to check the code against the coding standards used in CakePHP."
22-
},
23-
"autoload": {
24-
"psr-4": {
25-
"App\\": "src"
26-
}
27-
},
28-
"autoload-dev": {
29-
"psr-4": {
30-
"App\\Test\\": "tests",
31-
"Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
32-
}
33-
},
34-
"scripts": {
35-
"post-install-cmd": "App\\Console\\Installer::postInstall",
36-
"post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump"
37-
},
38-
"minimum-stability": "stable",
39-
"prefer-stable": true
2+
"name": "cakephp/app",
3+
"description": "CakePHP skeleton app",
4+
"homepage": "http://cakephp.org",
5+
"type": "project",
6+
"license": "MIT",
7+
"require": {
8+
"php": ">=5.5.9",
9+
"cakephp/cakephp": "~3.2",
10+
"mobiledetect/mobiledetectlib": "2.*",
11+
"cakephp/migrations": "~1.0",
12+
"cakephp/plugin-installer": "*",
13+
"markstory/asset_compress": "~3.0",
14+
"cakedc/showcase": "dev-master"
15+
},
16+
"require-dev": {
17+
"psy/psysh": "@stable",
18+
"cakephp/debug_kit": "~3.2",
19+
"cakephp/bake": "~1.1"
20+
},
21+
"suggest": {
22+
"phpunit/phpunit": "Allows automated tests to be run without system-wide install.",
23+
"cakephp/cakephp-codesniffer": "Allows to check the code against the coding standards used in CakePHP."
24+
},
25+
"autoload": {
26+
"psr-4": {
27+
"App\\": "src"
28+
}
29+
},
30+
"config": {
31+
"secure-http": false
32+
},
33+
"extra": {
34+
"installer-paths": {
35+
"plugins/Showcase": ["cakedc/showcase"]
36+
}
37+
},
38+
"repositories": [
39+
{
40+
"type": "vcs",
41+
"url": "[email protected]:cakedc/showcase.git"
42+
}
43+
],
44+
"autoload-dev": {
45+
"psr-4": {
46+
"App\\Test\\": "tests",
47+
"Cake\\Test\\": "./vendor/cakephp/cakephp/tests"
48+
}
49+
},
50+
"scripts": {
51+
"post-install-cmd": "App\\Console\\Installer::postInstall",
52+
"post-autoload-dump": "Cake\\Composer\\Installer\\PluginInstaller::postAutoloadDump"
53+
},
54+
"minimum-stability": "dev",
55+
"prefer-stable": true
4056
}

0 commit comments

Comments
 (0)