Skip to content

Commit 05483a2

Browse files
SSHVersionControlSSHVersionControl
authored
Merge pull request #11 from SSHVersionControl/support-php7.2
Support php7.2
2 parents 140226b + 7e1ed5f commit 05483a2

File tree

1,479 files changed

+27447
-4403
lines changed

Some content is hidden

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

1,479 files changed

+27447
-4403
lines changed

‎.gitattributes‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Make GitHub ignore vendor libraries while computing language stats.
22
# See https://github.com/github/linguist#overrides.
33

4-
/src/VersionControl/GitControlBundle/Resources/public/* linguist-vendored=true
5-
/src/VersionControl/GitCommandBundle/Resources/public/* linguist-vendored=true
6-
/src/VersionControl/GithubIssueBundle/Resources/public/* linguist-vendored=true
7-
/src/VersionControl/GitlabIssueBundle/Resources/public/* linguist-vendored=true
4+
/app/src/VersionControl/GitControlBundle/Resources/public/* linguist-vendored=true
5+
/app/src/VersionControl/GitCommandBundle/Resources/public/* linguist-vendored=true
6+
/app/src/VersionControl/GithubIssueBundle/Resources/public/* linguist-vendored=true
7+
/app/src/VersionControl/GitlabIssueBundle/Resources/public/* linguist-vendored=true

‎.gitignore‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
/web/bundles/
2-
/app/bootstrap.php.cache
3-
/app/cache/*
4-
/app/config/parameters.yml
5-
/app/logs/*
6-
!app/cache/.gitkeep
7-
!app/logs/.gitkeep
8-
/build/
9-
/vendor/
10-
/bin/
11-
/composer.phar
12-
/Documentation/*.mwb.bak
13-
/nbproject/
1+
/app/web/bundles/
2+
/app/app/bootstrap.php.cache
3+
/app/app/cache/*
4+
/app/app/config/parameters.yml
5+
/app/app/logs/*
6+
!app/app/cache/.gitkeep
7+
!app/app/logs/.gitkeep
8+
/app/build/
9+
/app/vendor/
10+
/app/bin/
11+
/app/composer.phar
12+
/app/Documentation/*.mwb.bak
13+
/nbproject/
14+
.idea

‎.travis.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ php:
99
- 7.1
1010

1111
before_script:
12-
- cp app/config/parameters.yml.travis app/config/parameters.yml
12+
- cp app/app/config/parameters.yml.travis app/app/config/parameters.yml
13+
- cd app
1314
- composer install -n
1415
- git --version
1516
- git config --global user.email "test@travis-ci.org"

‎README.md‎

Lines changed: 1 addition & 1 deletion

‎Documentation/DatabaseScheme.mwb‎ renamed to ‎app/Documentation/DatabaseScheme.mwb‎

File renamed without changes.

‎Documentation/WindowsGit.md‎ renamed to ‎app/Documentation/WindowsGit.md‎

‎Documentation/version-control.sql‎ renamed to ‎app/Documentation/version-control.sql‎

File renamed without changes.

‎app/.htaccess‎ renamed to ‎app/app/.htaccess‎

File renamed without changes.

‎app/AppCache.php‎ renamed to ‎app/app/AppCache.php‎

File renamed without changes.

‎app/AppKernel.php‎ renamed to ‎app/app/AppKernel.php‎

File renamed without changes.

0 commit comments

Comments
 (0)