Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

rebase

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2018-02-19 19:38:23 +01:00
parent 6b04d3542e
commit 1e423e880e
1 changed files with 12 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
composer.lock generated
View File

@ -4,11 +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"
], ],
<<<<<<< HEAD "content-hash": "4c6d81bc7ff768fe3e4842cd9e671b21",
"content-hash": "049183d97fa9891b1fed52d2d2c650f6",
=======
"content-hash": "ca65bb3c4c4e869d5d98afe8369236a5",
>>>>>>> Check for PHP 5.6
"packages": [ "packages": [
{ {
"name": "ircmaxell/password-compat", "name": "ircmaxell/password-compat",
@ -181,21 +177,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git", "url": "https://github.com/Roave/SecurityAdvisories.git",
<<<<<<< HEAD
"reference": "5ebdd35b291cf9be4a425022872cb3aaf03192df"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5ebdd35b291cf9be4a425022872cb3aaf03192df",
"reference": "5ebdd35b291cf9be4a425022872cb3aaf03192df",
=======
"reference": "94230db36bded9d164ffccabcb38c67eedd63595" "reference": "94230db36bded9d164ffccabcb38c67eedd63595"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/94230db36bded9d164ffccabcb38c67eedd63595", "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/94230db36bded9d164ffccabcb38c67eedd63595",
"reference": "94230db36bded9d164ffccabcb38c67eedd63595", "reference": "94230db36bded9d164ffccabcb38c67eedd63595",
>>>>>>> Check for PHP 5.6
"shasum": "" "shasum": ""
}, },
"conflict": { "conflict": {
@ -245,11 +232,7 @@
"onelogin/php-saml": "<2.10.4", "onelogin/php-saml": "<2.10.4",
"oro/crm": ">=1.7,<1.7.4", "oro/crm": ">=1.7,<1.7.4",
"oro/platform": ">=1.7,<1.7.4", "oro/platform": ">=1.7,<1.7.4",
<<<<<<< HEAD
"padraic/file_get_contents": "<1.1.2",
=======
"padraic/humbug_get_contents": "<1.1.2", "padraic/humbug_get_contents": "<1.1.2",
>>>>>>> Check for PHP 5.6
"phpmailer/phpmailer": ">=5,<5.2.24", "phpmailer/phpmailer": ">=5,<5.2.24",
"phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3",
"phpxmlrpc/extras": "<0.6.1", "phpxmlrpc/extras": "<0.6.1",
@ -284,7 +267,7 @@
"symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4",
"symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7", "symfony/yaml": ">=2,<2.0.22|>=2.1,<2.1.7",
"thelia/backoffice-default-template": ">=2.1,<2.1.2", "thelia/backoffice-default-template": ">=2.1,<2.1.2",
"thelia/thelia": ">=2.1,<2.1.2|>=2.1.0-beta1,<2.1.3", "thelia/thelia": ">=2.1.0-beta1,<2.1.3|>=2.1,<2.1.2",
"twig/twig": "<1.20", "twig/twig": "<1.20",
"typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5", "typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.22|>=8,<8.7.5",
"typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5", "typo3/flow": ">=1,<1.0.4|>=1.1,<1.1.1|>=2,<2.0.1|>=2.3,<2.3.16|>=3,<3.0.10|>=3.1,<3.1.7|>=3.2,<3.2.7|>=3.3,<3.3.5",
@ -333,11 +316,7 @@
} }
], ],
"description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it",
<<<<<<< HEAD
"time": "2018-02-13T10:17:11+00:00"
=======
"time": "2018-02-19T09:31:21+00:00" "time": "2018-02-19T09:31:21+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "smarty/smarty", "name": "smarty/smarty",
@ -446,8 +425,7 @@
"constructor", "constructor",
"instantiate" "instantiate"
], ],
<<<<<<< HEAD "time": "2015-06-14T21:17:01+00:00"
"time": "2017-07-22T11:58:36+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
@ -493,9 +471,6 @@
"object graph" "object graph"
], ],
"time": "2017-10-19T19:58:43+00:00" "time": "2017-10-19T19:58:43+00:00"
=======
"time": "2015-06-14T21:17:01+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "phpdocumentor/reflection-common", "name": "phpdocumentor/reflection-common",
@ -553,18 +528,6 @@
}, },
{ {
"name": "phpdocumentor/reflection-docblock", "name": "phpdocumentor/reflection-docblock",
<<<<<<< HEAD
"version": "4.3.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
"reference": "94fd0001232e47129dd3504189fa1c7225010d08"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
"reference": "94fd0001232e47129dd3504189fa1c7225010d08",
=======
"version": "3.3.2", "version": "3.3.2",
"source": { "source": {
"type": "git", "type": "git",
@ -575,7 +538,6 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2", "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bf329f6c1aadea3299f08ee804682b7c45b326a2",
"reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2", "reference": "bf329f6c1aadea3299f08ee804682b7c45b326a2",
>>>>>>> Check for PHP 5.6
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -607,11 +569,7 @@
} }
], ],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
<<<<<<< HEAD
"time": "2017-11-30T07:14:17+00:00"
=======
"time": "2017-11-10T14:09:06+00:00" "time": "2017-11-10T14:09:06+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "phpdocumentor/type-resolver", "name": "phpdocumentor/type-resolver",
@ -662,18 +620,6 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
<<<<<<< HEAD
"version": "1.7.4",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
"reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/9f901e29c93dae4aa77c0bb161df4276f9c9a1be",
"reference": "9f901e29c93dae4aa77c0bb161df4276f9c9a1be",
=======
"version": "1.7.5", "version": "1.7.5",
"source": { "source": {
"type": "git", "type": "git",
@ -684,7 +630,6 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401",
"reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401",
>>>>>>> Check for PHP 5.6
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -734,11 +679,7 @@
"spy", "spy",
"stub" "stub"
], ],
<<<<<<< HEAD
"time": "2018-02-11T18:49:29+00:00"
=======
"time": "2018-02-19T10:16:54+00:00" "time": "2018-02-19T10:16:54+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
@ -801,11 +742,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
<<<<<<< HEAD
"time": "2017-04-02T07:44:40+00:00" "time": "2017-04-02T07:44:40+00:00"
=======
"time": "2015-10-06T15:47:00+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "phpunit/php-file-iterator", "name": "phpunit/php-file-iterator",
@ -946,29 +883,29 @@
}, },
{ {
"name": "phpunit/php-token-stream", "name": "phpunit/php-token-stream",
"version": "2.0.2", "version": "1.4.12",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git", "url": "https://github.com/sebastianbergmann/php-token-stream.git",
"reference": "791198a2c6254db10131eecfe8c06670700904db" "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
"reference": "791198a2c6254db10131eecfe8c06670700904db", "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^7.0" "php": ">=5.3.3"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.2.4" "phpunit/phpunit": "~4.2"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.0-dev" "dev-master": "1.4-dev"
} }
}, },
"autoload": { "autoload": {
@ -991,11 +928,7 @@
"keywords": [ "keywords": [
"tokenizer" "tokenizer"
], ],
<<<<<<< HEAD
"time": "2017-11-27T05:48:46+00:00"
=======
"time": "2017-12-04T08:55:13+00:00" "time": "2017-12-04T08:55:13+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
@ -1077,11 +1010,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
<<<<<<< HEAD
"time": "2018-02-01T05:50:59+00:00" "time": "2018-02-01T05:50:59+00:00"
=======
"time": "2017-06-21T08:07:12+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
@ -1140,7 +1069,6 @@
"mock", "mock",
"xunit" "xunit"
], ],
<<<<<<< HEAD
"time": "2017-06-30T09:13:00+00:00" "time": "2017-06-30T09:13:00+00:00"
}, },
{ {
@ -1187,9 +1115,6 @@
"description": "Looks up which function or method a line of code belongs to", "description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
"time": "2017-03-04T06:30:41+00:00" "time": "2017-03-04T06:30:41+00:00"
=======
"time": "2015-10-02T06:51:40+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "sebastian/comparator", "name": "sebastian/comparator",
@ -1355,11 +1280,7 @@
"environment", "environment",
"hhvm" "hhvm"
], ],
<<<<<<< HEAD
"time": "2016-11-26T07:53:53+00:00" "time": "2016-11-26T07:53:53+00:00"
=======
"time": "2016-08-18T05:49:44+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "sebastian/exporter", "name": "sebastian/exporter",
@ -1426,11 +1347,7 @@
"export", "export",
"exporter" "exporter"
], ],
<<<<<<< HEAD
"time": "2016-11-19T08:54:04+00:00" "time": "2016-11-19T08:54:04+00:00"
=======
"time": "2016-06-17T09:04:28+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "sebastian/global-state", "name": "sebastian/global-state",
@ -1482,7 +1399,6 @@
"global state" "global state"
], ],
"time": "2015-10-12T03:26:01+00:00" "time": "2015-10-12T03:26:01+00:00"
<<<<<<< HEAD
}, },
{ {
"name": "sebastian/object-enumerator", "name": "sebastian/object-enumerator",
@ -1529,8 +1445,6 @@
"description": "Traverses array structures and object graphs to enumerate all referenced objects", "description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/", "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
"time": "2017-02-18T15:18:39+00:00" "time": "2017-02-18T15:18:39+00:00"
=======
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "sebastian/recursion-context", "name": "sebastian/recursion-context",
@ -1583,7 +1497,6 @@
], ],
"description": "Provides functionality to recursively process PHP variables", "description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context", "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
<<<<<<< HEAD
"time": "2016-11-19T07:33:16+00:00" "time": "2016-11-19T07:33:16+00:00"
}, },
{ {
@ -1627,9 +1540,6 @@
"description": "Provides a list of PHP built-in functions that operate on resources", "description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations", "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"time": "2015-07-28T20:34:47+00:00" "time": "2015-07-28T20:34:47+00:00"
=======
"time": "2016-10-03T07:41:43+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "sebastian/version", "name": "sebastian/version",
@ -1672,24 +1582,8 @@
], ],
"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",
<<<<<<< HEAD
"time": "2016-10-03T07:35:21+00:00" "time": "2016-10-03T07:35:21+00:00"
}, },
{
"name": "symfony/yaml",
"version": "v4.0.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "ffc60bda1d4a00ec0b32eeabf39dc017bf480028"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/ffc60bda1d4a00ec0b32eeabf39dc017bf480028",
"reference": "ffc60bda1d4a00ec0b32eeabf39dc017bf480028",
=======
"time": "2015-06-21T13:59:46+00:00"
},
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
"version": "v3.4.4", "version": "v3.4.4",
@ -1702,11 +1596,10 @@
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/eab73b6c21d27ae4cd037c417618dfd4befb0bfe", "url": "https://api.github.com/repos/symfony/yaml/zipball/eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
"reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe", "reference": "eab73b6c21d27ae4cd037c417618dfd4befb0bfe",
>>>>>>> Check for PHP 5.6
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3" "php": "^5.5.9|>=7.0.8"
}, },
"conflict": { "conflict": {
"symfony/console": "<3.4" "symfony/console": "<3.4"
@ -1720,7 +1613,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "3.4-dev"
} }
}, },
"autoload": { "autoload": {
@ -1747,11 +1640,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
<<<<<<< HEAD
"time": "2018-01-21T19:06:11+00:00"
=======
"time": "2018-01-21T19:05:02+00:00" "time": "2018-01-21T19:05:02+00:00"
>>>>>>> Check for PHP 5.6
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",