Fixed PHP requirements.

This commit is contained in:
Klaus Silveira
2017-08-22 11:32:37 -04:00
parent 1d7ee82acb
commit 398344a3fd
5 changed files with 223 additions and 79 deletions

View File

@@ -10,7 +10,6 @@ return PhpCsFixer\Config::create()
'array_syntax' => ['syntax' => 'short'], 'array_syntax' => ['syntax' => 'short'],
'blank_line_after_opening_tag' => true, 'blank_line_after_opening_tag' => true,
'concat_space' => ['spacing' => 'one'], 'concat_space' => ['spacing' => 'one'],
'method_argument_space' => ['ensure_fully_multiline' => true],
'modernize_types_casting' => true, 'modernize_types_casting' => true,
'no_multiline_whitespace_before_semicolons' => true, 'no_multiline_whitespace_before_semicolons' => true,
'no_useless_else' => true, 'no_useless_else' => true,
@@ -22,7 +21,6 @@ return PhpCsFixer\Config::create()
'php_unit_construct' => true, 'php_unit_construct' => true,
'php_unit_dedicate_assert' => true, 'php_unit_dedicate_assert' => true,
'pre_increment' => false, 'pre_increment' => false,
'single_line_comment_style' => true,
]) ])
->setFinder($finder) ->setFinder($finder)
->setUsingCache(true) ->setUsingCache(true)

View File

@@ -1,7 +1,6 @@
language: php language: php
php: php:
- 5.4
- 7.0 - 7.0
- 7.1 - 7.1

View File

@@ -26,7 +26,7 @@ In order to run GitList on your server, you'll need:
* git * git
* Apache with mod_rewrite enabled or nginx * Apache with mod_rewrite enabled or nginx
* PHP 5.4 * PHP 7
## Installation ## Installation
* Download GitList from [gitlist.org](http://gitlist.org/) and decompress to your `/var/www/gitlist` folder, or anywhere else you want to place GitList. * Download GitList from [gitlist.org](http://gitlist.org/) and decompress to your `/var/www/gitlist` folder, or anywhere else you want to place GitList.

View File

@@ -4,18 +4,19 @@
"require": { "require": {
"silex/silex": "~2.2", "silex/silex": "~2.2",
"twig/twig": "~2.4", "twig/twig": "~2.4",
"symfony/twig-bridge": "~3.3", "symfony/twig-bridge": "~3.0",
"symfony/filesystem": "~3.3", "symfony/filesystem": "~3.0",
"klaussilveira/gitter": "0.2.*" "klaussilveira/gitter": "0.2.*"
}, },
"require-dev": { "require-dev": {
"symfony/browser-kit": "~3.3", "symfony/browser-kit": "~3.0",
"symfony/css-selector": "~3.3", "symfony/css-selector": "~3.0",
"phpunit/phpunit": "~5.0", "phpunit/phpunit": "~5.0",
"phpmd/phpmd": "1.5.*", "phpmd/phpmd": "1.5.*",
"phploc/phploc": "2.0.*", "phploc/phploc": "2.0.*",
"sebastian/phpcpd": "2.0.*", "sebastian/phpcpd": "2.0.*",
"friendsofphp/php-cs-fixer": "~2.4" "doctrine/annotations": "^1.4",
"friendsofphp/php-cs-fixer": "^2.5"
}, },
"minimum-stability": "stable", "minimum-stability": "stable",
"autoload": { "autoload": {

286
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "da84233163c28f8b1684d238d2cd3cca", "content-hash": "1a456967bcae5fc56ed8e997f8f8a9fd",
"packages": [ "packages": [
{ {
"name": "klaussilveira/gitter", "name": "klaussilveira/gitter",
@@ -291,16 +291,16 @@
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v3.3.6", "version": "v3.0.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13" "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/7c13ae8ce1e2adbbd574fc39de7be498e1284e13", "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a",
"reference": "7c13ae8ce1e2adbbd574fc39de7be498e1284e13", "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -311,12 +311,13 @@
"symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
}, },
"require-dev": { "require-dev": {
"symfony/class-loader": "~2.8|~3.0",
"symfony/http-kernel": "~2.8|~3.0" "symfony/http-kernel": "~2.8|~3.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "3.0-dev"
} }
}, },
"autoload": { "autoload": {
@@ -343,7 +344,7 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-28T15:27:31+00:00" "time": "2016-07-30T07:22:48+00:00"
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
@@ -1115,16 +1116,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.5.0", "version": "v2.2.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "63aad575ec2a29d50eb6c3b5cbc17430b28895b2" "reference": "c1cc52c242f17c4d52d9601159631da488fac7a4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/63aad575ec2a29d50eb6c3b5cbc17430b28895b2", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c1cc52c242f17c4d52d9601159631da488fac7a4",
"reference": "63aad575ec2a29d50eb6c3b5cbc17430b28895b2", "reference": "c1cc52c242f17c4d52d9601159631da488fac7a4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1132,25 +1133,26 @@
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"gecko-packages/gecko-php-unit": "^2.0", "gecko-packages/gecko-php-unit": "^2.0",
"php": "^5.6 || >=7.0 <7.2", "php": "^5.3.6 || >=7.0 <7.2",
"sebastian/diff": "^1.4", "sebastian/diff": "^1.4",
"symfony/console": "^3.2", "symfony/console": "^2.4 || ^3.0",
"symfony/event-dispatcher": "^3.0", "symfony/event-dispatcher": "^2.1 || ^3.0",
"symfony/filesystem": "^3.0", "symfony/filesystem": "^2.4 || ^3.0",
"symfony/finder": "^3.0", "symfony/finder": "^2.2 || ^3.0",
"symfony/options-resolver": "^3.0", "symfony/options-resolver": "^2.6 || ^3.0",
"symfony/polyfill-php54": "^1.0",
"symfony/polyfill-php55": "^1.3",
"symfony/polyfill-php70": "^1.0", "symfony/polyfill-php70": "^1.0",
"symfony/polyfill-php72": "^1.4", "symfony/polyfill-php72": "^1.4",
"symfony/process": "^3.0", "symfony/process": "^2.3 || ^3.0",
"symfony/stopwatch": "^3.0" "symfony/stopwatch": "^2.5 || ^3.0"
}, },
"conflict": { "conflict": {
"hhvm": "*" "hhvm": "<3.18"
}, },
"require-dev": { "require-dev": {
"johnkary/phpunit-speedtrap": "^1.1", "johnkary/phpunit-speedtrap": "^1.0.1",
"justinrainbow/json-schema": "^5.0", "justinrainbow/json-schema": "^5.0",
"php-cs-fixer/accessible-object": "^1.0",
"phpunit/phpunit": "^4.8.35 || ^5.4.3", "phpunit/phpunit": "^4.8.35 || ^5.4.3",
"satooshi/php-coveralls": "^1.0", "satooshi/php-coveralls": "^1.0",
"symfony/phpunit-bridge": "^3.2.2" "symfony/phpunit-bridge": "^3.2.2"
@@ -1163,12 +1165,16 @@
"php-cs-fixer" "php-cs-fixer"
], ],
"type": "application", "type": "application",
"extra": {
"branch-alias": {
"dev-master": "2.2-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"PhpCsFixer\\": "src/" "PhpCsFixer\\": "src/"
}, },
"classmap": [ "classmap": [
"tests/Test/Assert/AssertTokensTrait.php",
"tests/Test/AbstractFixerTestCase.php", "tests/Test/AbstractFixerTestCase.php",
"tests/Test/AbstractIntegrationTestCase.php", "tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/IntegrationCase.php", "tests/Test/IntegrationCase.php",
@@ -1190,7 +1196,7 @@
} }
], ],
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"time": "2017-08-22T14:15:09+00:00" "time": "2017-08-22T14:08:16+00:00"
}, },
{ {
"name": "gecko-packages/gecko-php-unit", "name": "gecko-packages/gecko-php-unit",
@@ -1231,6 +1237,48 @@
], ],
"time": "2017-06-20T11:22:48+00:00" "time": "2017-06-20T11:22:48+00:00"
}, },
{
"name": "ircmaxell/password-compat",
"version": "v1.0.4",
"source": {
"type": "git",
"url": "https://github.com/ircmaxell/password_compat.git",
"reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
"reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
"shasum": ""
},
"require-dev": {
"phpunit/phpunit": "4.*"
},
"type": "library",
"autoload": {
"files": [
"lib/password.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Anthony Ferrara",
"email": "ircmaxell@php.net",
"homepage": "http://blog.ircmaxell.com"
}
],
"description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
"homepage": "https://github.com/ircmaxell/password_compat",
"keywords": [
"hashing",
"password"
],
"time": "2014-11-20T16:49:30+00:00"
},
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
"version": "1.6.1", "version": "1.6.1",
@@ -1502,24 +1550,24 @@
}, },
{ {
"name": "phploc/phploc", "name": "phploc/phploc",
"version": "2.0.5", "version": "2.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phploc.git", "url": "https://github.com/sebastianbergmann/phploc.git",
"reference": "d177c22e2a08e448f7bdfa762045f7bd086834d7" "reference": "322ad07c112d5c6832abed4269d648cacff5959b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/d177c22e2a08e448f7bdfa762045f7bd086834d7", "url": "https://api.github.com/repos/sebastianbergmann/phploc/zipball/322ad07c112d5c6832abed4269d648cacff5959b",
"reference": "d177c22e2a08e448f7bdfa762045f7bd086834d7", "reference": "322ad07c112d5c6832abed4269d648cacff5959b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.3.3", "php": ">=5.3.3",
"sebastian/finder-facade": ">=1.1.0", "sebastian/finder-facade": "~1.1",
"sebastian/git": ">=1.0.0", "sebastian/git": "~1.0",
"sebastian/version": ">=1.0.3", "sebastian/version": "~1.0",
"symfony/console": ">=2.2.0" "symfony/console": "~2.2"
}, },
"bin": [ "bin": [
"phploc" "phploc"
@@ -1548,7 +1596,7 @@
], ],
"description": "A tool for quickly measuring the size of a PHP project.", "description": "A tool for quickly measuring the size of a PHP project.",
"homepage": "https://github.com/sebastianbergmann/phploc", "homepage": "https://github.com/sebastianbergmann/phploc",
"time": "2014-04-27T06:47:27+00:00" "time": "2014-06-25T08:11:02+00:00"
}, },
{ {
"name": "phpmd/phpmd", "name": "phpmd/phpmd",
@@ -2359,16 +2407,16 @@
}, },
{ {
"name": "sebastian/git", "name": "sebastian/git",
"version": "2.1.4", "version": "1.2.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/git.git", "url": "https://github.com/sebastianbergmann/git.git",
"reference": "815bbbc963cf35e5413df195aa29df58243ecd24" "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/git/zipball/815bbbc963cf35e5413df195aa29df58243ecd24", "url": "https://api.github.com/repos/sebastianbergmann/git/zipball/a99fbc102e982c1404041ef3e4d431562b29bcba",
"reference": "815bbbc963cf35e5413df195aa29df58243ecd24", "reference": "a99fbc102e982c1404041ef3e4d431562b29bcba",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2377,7 +2425,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.1-dev" "dev-master": "1.2-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2401,7 +2449,7 @@
"git" "git"
], ],
"abandoned": true, "abandoned": true,
"time": "2017-01-23T20:57:12+00:00" "time": "2013-08-04T09:35:29+00:00"
}, },
{ {
"name": "sebastian/global-state", "name": "sebastian/global-state",
@@ -2648,27 +2696,19 @@
}, },
{ {
"name": "sebastian/version", "name": "sebastian/version",
"version": "2.0.1", "version": "1.0.6",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/version.git", "url": "https://github.com/sebastianbergmann/version.git",
"reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
"reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
"shasum": "" "shasum": ""
}, },
"require": {
"php": ">=5.6"
},
"type": "library", "type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": { "autoload": {
"classmap": [ "classmap": [
"src/" "src/"
@@ -2687,7 +2727,7 @@
], ],
"description": "Library that helps with managing the version number of Git-hosted PHP projects", "description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version", "homepage": "https://github.com/sebastianbergmann/version",
"time": "2016-10-03T07:35:21+00:00" "time": "2015-06-21T13:59:46+00:00"
}, },
{ {
"name": "symfony/browser-kit", "name": "symfony/browser-kit",
@@ -2748,45 +2788,37 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v3.3.6", "version": "v2.8.26",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "b0878233cb5c4391347e5495089c7af11b8e6201" "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/b0878233cb5c4391347e5495089c7af11b8e6201", "url": "https://api.github.com/repos/symfony/console/zipball/32a3c6b3398de5db8ed381f4ef92970c59c2fcdd",
"reference": "b0878233cb5c4391347e5495089c7af11b8e6201", "reference": "32a3c6b3398de5db8ed381f4ef92970c59c2fcdd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": ">=5.5.9", "php": ">=5.3.9",
"symfony/debug": "~2.8|~3.0", "symfony/debug": "^2.7.2|~3.0.0",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-mbstring": "~1.0"
}, },
"conflict": {
"symfony/dependency-injection": "<3.3"
},
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.3", "symfony/event-dispatcher": "~2.1|~3.0.0",
"symfony/dependency-injection": "~3.3", "symfony/process": "~2.1|~3.0.0"
"symfony/event-dispatcher": "~2.8|~3.0",
"symfony/filesystem": "~2.8|~3.0",
"symfony/http-kernel": "~2.8|~3.0",
"symfony/process": "~2.8|~3.0"
}, },
"suggest": { "suggest": {
"psr/log": "For using the console logger", "psr/log": "For using the console logger",
"symfony/event-dispatcher": "", "symfony/event-dispatcher": "",
"symfony/filesystem": "",
"symfony/process": "" "symfony/process": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.3-dev" "dev-master": "2.8-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2813,7 +2845,7 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29T21:27:59+00:00" "time": "2017-07-29T21:26:04+00:00"
}, },
{ {
"name": "symfony/css-selector", "name": "symfony/css-selector",
@@ -3027,6 +3059,120 @@
], ],
"time": "2017-04-12T14:14:56+00:00" "time": "2017-04-12T14:14:56+00:00"
}, },
{
"name": "symfony/polyfill-php54",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php54.git",
"reference": "b7763422a5334c914ef0298ed21b253d25913a6e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e",
"reference": "b7763422a5334c914ef0298ed21b253d25913a6e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php54\\": ""
},
"files": [
"bootstrap.php"
],
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"time": "2017-06-14T15:44:48+00:00"
},
{
"name": "symfony/polyfill-php55",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php55.git",
"reference": "29b1381d66f16e0581aab0b9f678ccf073288f68"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/29b1381d66f16e0581aab0b9f678ccf073288f68",
"reference": "29b1381d66f16e0581aab0b9f678ccf073288f68",
"shasum": ""
},
"require": {
"ircmaxell/password-compat": "~1.0",
"php": ">=5.3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.5-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Polyfill\\Php55\\": ""
},
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"time": "2017-06-14T15:44:48+00:00"
},
{ {
"name": "symfony/polyfill-php70", "name": "symfony/polyfill-php70",
"version": "v1.5.0", "version": "v1.5.0",