diff --git a/src/ninegate-1.0/composer.json b/src/ninegate-1.0/composer.json index e8126ef1..a04b93a2 100644 --- a/src/ninegate-1.0/composer.json +++ b/src/ninegate-1.0/composer.json @@ -40,6 +40,7 @@ "symfony/symfony": "3.4.*", "tetranz/select2entity-bundle": "2.*", "thecsea/simple-caldav-client": "^0.1.10", + "mashape/unirest-php": "2.*", "twig/twig": "^1.0||^2.0" }, "require-dev": { diff --git a/src/ninegate-1.0/composer.lock b/src/ninegate-1.0/composer.lock index a4a1702f..f4b2e59d 100644 --- a/src/ninegate-1.0/composer.lock +++ b/src/ninegate-1.0/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "0430b523c39e2d254cfe1fb91666119b", - "content-hash": "36178f772c0f0ff6bd5ac90edd474c25", + "hash": "5c29a0c1698bd753d6b42df4822e5f2d", + "content-hash": "51482d6b9f9c27b385c17393182e0d82", "packages": [ { "name": "cboden/ratchet", @@ -62,25 +62,25 @@ }, { "name": "composer/ca-bundle", - "version": "1.1.4", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d" + "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/558f321c52faeb4828c03e7dc0cfe39a09e09a2d", - "reference": "558f321c52faeb4828c03e7dc0cfe39a09e09a2d", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/10bb96592168a0f8e8f6dcde3532d9fa50b0b527", + "reference": "10bb96592168a0f8e8f6dcde3532d9fa50b0b527", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0" + "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5", + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8", "psr/log": "^1.0", "symfony/process": "^2.5 || ^3.0 || ^4.0" }, @@ -114,7 +114,7 @@ "ssl", "tls" ], - "time": "2019-01-28 09:30:10" + "time": "2019-08-30 08:44:50" }, { "name": "debril/feed-io", @@ -1822,27 +1822,28 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.3.3", + "version": "6.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + "reference": "0895c932405407fd3a7368b6910c09a24d26db11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11", + "reference": "0895c932405407fd3a7368b6910c09a24d26db11", "shasum": "" }, "require": { + "ext-json": "*", "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.4", + "guzzlehttp/psr7": "^1.6.1", "php": ">=5.5" }, "require-dev": { "ext-curl": "*", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.0" + "psr/log": "^1.1" }, "suggest": { "psr/log": "Required for using the Log middleware" @@ -1854,12 +1855,12 @@ } }, "autoload": { - "files": [ - "src/functions_include.php" - ], "psr-4": { "GuzzleHttp\\": "src/" - } + }, + "files": [ + "src/functions_include.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1883,7 +1884,7 @@ "rest", "web service" ], - "time": "2018-04-22 15:46:56" + "time": "2019-10-23 15:58:00" }, { "name": "guzzlehttp/promises", @@ -2060,16 +2061,16 @@ }, { "name": "jasig/phpcas", - "version": "1.3.7", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/apereo/phpCAS.git", - "reference": "b5b29102c3a42f570c4a3e852f3cf67cae6d6082" + "reference": "40c0769ce05a30c8172b36ceab11124375c8366e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/apereo/phpCAS/zipball/b5b29102c3a42f570c4a3e852f3cf67cae6d6082", - "reference": "b5b29102c3a42f570c4a3e852f3cf67cae6d6082", + "url": "https://api.github.com/repos/apereo/phpCAS/zipball/40c0769ce05a30c8172b36ceab11124375c8366e", + "reference": "40c0769ce05a30c8172b36ceab11124375c8366e", "shasum": "" }, "require": { @@ -2111,7 +2112,7 @@ "cas", "jasig" ], - "time": "2019-04-22 19:48:16" + "time": "2019-08-18 20:01:55" }, { "name": "jdorn/sql-formatter", @@ -2407,17 +2408,61 @@ "time": "2018-05-23 08:11:59" }, { - "name": "monolog/monolog", - "version": "1.24.0", + "name": "mashape/unirest-php", + "version": "v2.6.6", "source": { "type": "git", - "url": "https://github.com/Seldaek/monolog.git", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266" + "url": "https://github.com/Mashape/unirest-php.git", + "reference": "73c2d903232bb5a125396e606b67314a87b8b21c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", - "reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266", + "url": "https://api.github.com/repos/Mashape/unirest-php/zipball/73c2d903232bb5a125396e606b67314a87b8b21c", + "reference": "73c2d903232bb5a125396e606b67314a87b8b21c", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "codeclimate/php-test-reporter": "0.1.*", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "autoload": { + "psr-0": { + "Unirest": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Unirest PHP", + "homepage": "https://github.com/Mashape/unirest-php", + "keywords": [ + "client", + "curl", + "http", + "https", + "rest" + ], + "time": "2016-02-16 16:45:52" + }, + { + "name": "monolog/monolog", + "version": "1.25.2", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/d5e2fb341cb44f7e2ab639d12a1e5901091ec287", + "reference": "d5e2fb341cb44f7e2ab639d12a1e5901091ec287", "shasum": "" }, "require": { @@ -2482,7 +2527,7 @@ "logging", "psr-3" ], - "time": "2018-11-05 09:00:11" + "time": "2019-11-13 10:00:05" }, { "name": "ocramius/proxy-manager", @@ -2867,16 +2912,16 @@ }, { "name": "psr/log", - "version": "1.1.0", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", "shasum": "" }, "require": { @@ -2885,7 +2930,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -2910,7 +2955,7 @@ "psr", "psr-3" ], - "time": "2018-11-20 15:27:04" + "time": "2019-11-01 11:05:21" }, { "name": "psr/simple-cache", @@ -3173,23 +3218,23 @@ }, { "name": "react/dns", - "version": "v1.1.0", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/reactphp/dns.git", - "reference": "a04f6f23ee40afec2e5814ddfbdf71b9e88bbc1f" + "reference": "a214d90c2884dac18d0cac6176202f247b66d762" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/dns/zipball/a04f6f23ee40afec2e5814ddfbdf71b9e88bbc1f", - "reference": "a04f6f23ee40afec2e5814ddfbdf71b9e88bbc1f", + "url": "https://api.github.com/repos/reactphp/dns/zipball/a214d90c2884dac18d0cac6176202f247b66d762", + "reference": "a214d90c2884dac18d0cac6176202f247b66d762", "shasum": "" }, "require": { "php": ">=5.3.0", "react/cache": "^1.0 || ^0.6 || ^0.5", - "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5", - "react/promise": "^2.1 || ^1.2.1", + "react/event-loop": "^1.0 || ^0.5", + "react/promise": "^2.7 || ^1.2.1", "react/promise-timer": "^1.2" }, "require-dev": { @@ -3213,7 +3258,7 @@ "dns-resolver", "reactphp" ], - "time": "2019-07-18 09:47:47" + "time": "2019-08-15 09:06:31" }, { "name": "react/event-loop", @@ -3450,16 +3495,16 @@ }, { "name": "robrichards/xmlseclibs", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/robrichards/xmlseclibs.git", - "reference": "406c68ac9124db033d079284b719958b829cb830" + "reference": "0a53d3c3aa87564910cae4ed01416441d3ae0db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/406c68ac9124db033d079284b719958b829cb830", - "reference": "406c68ac9124db033d079284b719958b829cb830", + "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/0a53d3c3aa87564910cae4ed01416441d3ae0db5", + "reference": "0a53d3c3aa87564910cae4ed01416441d3ae0db5", "shasum": "" }, "require": { @@ -3484,7 +3529,7 @@ "xml", "xmldsig" ], - "time": "2018-11-15 11:59:02" + "time": "2019-11-05 11:44:22" }, { "name": "sensio/distribution-bundle", @@ -3781,30 +3826,30 @@ }, { "name": "symfony/monolog-bundle", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d" + "reference": "dd80460fcfe1fa2050a7103ad818e9d0686ce6fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7fbecb371c1c614642c93c6b2cbcdf723ae8809d", - "reference": "7fbecb371c1c614642c93c6b2cbcdf723ae8809d", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/dd80460fcfe1fa2050a7103ad818e9d0686ce6fd", + "reference": "dd80460fcfe1fa2050a7103ad818e9d0686ce6fd", "shasum": "" }, "require": { - "monolog/monolog": "~1.22", + "monolog/monolog": "~1.22 || ~2.0", "php": ">=5.6", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4.10|^4.0.10", - "symfony/http-kernel": "~3.4|~4.0", - "symfony/monolog-bridge": "~3.4|~4.0" + "symfony/config": "~3.4 || ~4.0 || ^5.0", + "symfony/dependency-injection": "~3.4.10 || ^4.0.10 || ^5.0", + "symfony/http-kernel": "~3.4 || ~4.0 || ^5.0", + "symfony/monolog-bridge": "~3.4 || ~4.0 || ^5.0" }, "require-dev": { - "symfony/console": "~3.4|~4.0", - "symfony/phpunit-bridge": "^3.4.19|^4.0", - "symfony/yaml": "~3.4|~4.0" + "symfony/console": "~3.4 || ~4.0 || ^5.0", + "symfony/phpunit-bridge": "^3.4.19 || ^4.0 || ^5.0", + "symfony/yaml": "~3.4 || ~4.0 || ^5.0" }, "type": "symfony-bundle", "extra": { @@ -3825,13 +3870,13 @@ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" } ], "description": "Symfony MonologBundle", @@ -3840,24 +3885,24 @@ "log", "logging" ], - "time": "2019-06-20 12:18:19" + "time": "2019-11-13 13:11:14" }, { "name": "symfony/orm-pack", - "version": "v1.0.6", + "version": "v1.0.7", "source": { "type": "git", "url": "https://github.com/symfony/orm-pack.git", - "reference": "36c2a928482dc5f05c5c1c1b947242ae03ff1335" + "reference": "c57f5e05232ca40626eb9fa52a32bc8565e9231c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/orm-pack/zipball/36c2a928482dc5f05c5c1c1b947242ae03ff1335", - "reference": "36c2a928482dc5f05c5c1c1b947242ae03ff1335", + "url": "https://api.github.com/repos/symfony/orm-pack/zipball/c57f5e05232ca40626eb9fa52a32bc8565e9231c", + "reference": "c57f5e05232ca40626eb9fa52a32bc8565e9231c", "shasum": "" }, "require": { - "doctrine/doctrine-bundle": "^1.6.10", + "doctrine/doctrine-bundle": "^1.6.10|^2.0", "doctrine/doctrine-migrations-bundle": "^1.3|^2.0", "doctrine/orm": "^2.5.11", "php": "^7.0" @@ -3868,20 +3913,20 @@ "MIT" ], "description": "A pack for the Doctrine ORM", - "time": "2019-01-16 09:49:15" + "time": "2019-10-18 05:41:09" }, { "name": "symfony/polyfill-apcu", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-apcu.git", - "reference": "a502face1da6a53289480166f24de2c3c68e5c3c" + "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a502face1da6a53289480166f24de2c3c68e5c3c", - "reference": "a502face1da6a53289480166f24de2c3c68e5c3c", + "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/71ce80635d5dcd67772b4dda00b86068595f64d5", + "reference": "71ce80635d5dcd67772b4dda00b86068595f64d5", "shasum": "" }, "require": { @@ -3890,7 +3935,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3924,20 +3969,20 @@ "portable", "shim" ], - "time": "2019-02-06 07:57:58" + "time": "2019-08-06 08:03:45" }, { "name": "symfony/polyfill-ctype", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "82ebae02209c21113908c229e9883c419720738a" + "reference": "550ebaac289296ce228a706d0867afc34687e3f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", - "reference": "82ebae02209c21113908c229e9883c419720738a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", + "reference": "550ebaac289296ce228a706d0867afc34687e3f4", "shasum": "" }, "require": { @@ -3949,7 +3994,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -3966,12 +4011,12 @@ ], "authors": [ { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" }, { - "name": "Gert de Pagter", - "email": "backendtea@gmail.com" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -3982,25 +4027,25 @@ "polyfill", "portable" ], - "time": "2019-02-06 07:57:58" + "time": "2019-08-06 08:03:45" }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", - "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057" + "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/999878a3a09d73cae157b0cf89bb6fb2cc073057", - "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/66810b9d6eb4af54d543867909d65ab9af654d7e", + "reference": "66810b9d6eb4af54d543867909d65ab9af654d7e", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/intl": "~2.3|~3.0|~4.0" + "symfony/intl": "~2.3|~3.0|~4.0|~5.0" }, "suggest": { "ext-intl": "For best performance" @@ -4008,7 +4053,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -4040,20 +4085,20 @@ "portable", "shim" ], - "time": "2019-01-07 19:39:47" + "time": "2019-08-06 08:03:45" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609" + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609", - "reference": "fe5e94c604826c35a32fa832f35bd036b6799609", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", "shasum": "" }, "require": { @@ -4065,7 +4110,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -4099,20 +4144,20 @@ "portable", "shim" ], - "time": "2019-02-06 07:57:58" + "time": "2019-08-06 08:03:45" }, { "name": "symfony/polyfill-php56", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42" + "reference": "0e3b212e96a51338639d8ce175c046d7729c3403" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42", - "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/0e3b212e96a51338639d8ce175c046d7729c3403", + "reference": "0e3b212e96a51338639d8ce175c046d7729c3403", "shasum": "" }, "require": { @@ -4122,7 +4167,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -4155,20 +4200,20 @@ "portable", "shim" ], - "time": "2019-02-06 07:57:58" + "time": "2019-08-06 08:03:45" }, { "name": "symfony/polyfill-php70", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "bc4858fb611bda58719124ca079baff854149c89" + "reference": "54b4c428a0054e254223797d2713c31e08610831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89", - "reference": "bc4858fb611bda58719124ca079baff854149c89", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/54b4c428a0054e254223797d2713c31e08610831", + "reference": "54b4c428a0054e254223797d2713c31e08610831", "shasum": "" }, "require": { @@ -4178,7 +4223,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -4214,20 +4259,20 @@ "portable", "shim" ], - "time": "2019-02-06 07:57:58" + "time": "2019-08-06 08:03:45" }, { "name": "symfony/polyfill-util", - "version": "v1.11.0", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "b46c6cae28a3106735323f00a0c38eccf2328897" + "reference": "4317de1386717b4c22caed7725350a8887ab205c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897", - "reference": "b46c6cae28a3106735323f00a0c38eccf2328897", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/4317de1386717b4c22caed7725350a8887ab205c", + "reference": "4317de1386717b4c22caed7725350a8887ab205c", "shasum": "" }, "require": { @@ -4236,7 +4281,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -4266,7 +4311,7 @@ "polyfill", "shim" ], - "time": "2019-02-08 14:16:39" + "time": "2019-08-06 08:03:45" }, { "name": "symfony/swiftmailer-bundle", @@ -4329,16 +4374,16 @@ }, { "name": "symfony/symfony", - "version": "v3.4.29", + "version": "v3.4.35", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "4c9b6d7d898457ae2189efdfaca58712269fc994" + "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/4c9b6d7d898457ae2189efdfaca58712269fc994", - "reference": "4c9b6d7d898457ae2189efdfaca58712269fc994", + "url": "https://api.github.com/repos/symfony/symfony/zipball/2adc85d49cbe14e346068fa7e9c2e1f08ab31de6", + "reference": "2adc85d49cbe14e346068fa7e9c2e1f08ab31de6", "shasum": "" }, "require": { @@ -4357,7 +4402,7 @@ "symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-php56": "~1.0", "symfony/polyfill-php70": "~1.6", - "twig/twig": "^1.40|^2.9" + "twig/twig": "^1.41|^2.10" }, "conflict": { "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2", @@ -4436,7 +4481,7 @@ "ocramius/proxy-manager": "~0.4|~1.0|~2.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0", "predis/predis": "~1.0", - "symfony/phpunit-bridge": "~3.4|~4.0|~5.0", + "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0", "symfony/security-acl": "~2.8|~3.0" }, "type": "library", @@ -4480,20 +4525,20 @@ "keywords": [ "framework" ], - "time": "2019-06-26 13:56:55" + "time": "2019-11-13 08:45:05" }, { "name": "tetranz/select2entity-bundle", - "version": "v2.10.0", + "version": "v2.10.1", "source": { "type": "git", "url": "https://github.com/tetranz/select2entity-bundle.git", - "reference": "67b61be1a23228bc4e77a2e59ba5fff8fd9fffab" + "reference": "1d4b184e41bdb76a61d7462b748d9cf0ecade47a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tetranz/select2entity-bundle/zipball/67b61be1a23228bc4e77a2e59ba5fff8fd9fffab", - "reference": "67b61be1a23228bc4e77a2e59ba5fff8fd9fffab", + "url": "https://api.github.com/repos/tetranz/select2entity-bundle/zipball/1d4b184e41bdb76a61d7462b748d9cf0ecade47a", + "reference": "1d4b184e41bdb76a61d7462b748d9cf0ecade47a", "shasum": "" }, "require": { @@ -4527,7 +4572,7 @@ "symfony", "typeahead" ], - "time": "2019-07-07 23:00:30" + "time": "2019-07-14 02:30:34" }, { "name": "thecsea/simple-caldav-client", @@ -4574,16 +4619,16 @@ }, { "name": "twig/twig", - "version": "v2.11.3", + "version": "v2.12.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "699ed2342557c88789a15402de5eb834dedd6792" + "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/699ed2342557c88789a15402de5eb834dedd6792", - "reference": "699ed2342557c88789a15402de5eb834dedd6792", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed", + "reference": "d761fd1f1c6b867ae09a7d8119a6d95d06dc44ed", "shasum": "" }, "require": { @@ -4593,13 +4638,13 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^2.7", - "symfony/phpunit-bridge": "^3.4.19|^4.1.8|^5.0" + "symfony/debug": "^3.4|^4.2", + "symfony/phpunit-bridge": "^4.4@dev|^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.11-dev" + "dev-master": "2.12-dev" } }, "autoload": { @@ -4621,15 +4666,15 @@ "homepage": "http://fabien.potencier.org", "role": "Lead Developer" }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" - }, { "name": "Twig Team", "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -4637,7 +4682,7 @@ "keywords": [ "templating" ], - "time": "2019-06-18 15:37:11" + "time": "2019-11-11 16:52:09" }, { "name": "zendframework/zend-code", @@ -4749,16 +4794,16 @@ "packages-dev": [ { "name": "nikic/php-parser", - "version": "v4.2.2", + "version": "v4.3.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420" + "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420", - "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9a9981c347c5c49d6dfe5cf826bb882b824080dc", + "reference": "9a9981c347c5c49d6dfe5cf826bb882b824080dc", "shasum": "" }, "require": { @@ -4766,7 +4811,8 @@ "php": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "^6.5 || ^7.0" + "ircmaxell/php-yacc": "0.0.5", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" }, "bin": [ "bin/php-parse" @@ -4774,7 +4820,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -4796,7 +4842,7 @@ "parser", "php" ], - "time": "2019-05-25 20:07:01" + "time": "2019-11-08 13:50:10" }, { "name": "sensio/generator-bundle", @@ -4854,40 +4900,40 @@ }, { "name": "symfony/maker-bundle", - "version": "v1.12.0", + "version": "v1.14.3", "source": { "type": "git", "url": "https://github.com/symfony/maker-bundle.git", - "reference": "201d0e050dca336c44f93657ce1f34f3b3868432" + "reference": "c864e7f9b8d1e1f5f60acc3beda11299f637aded" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/201d0e050dca336c44f93657ce1f34f3b3868432", - "reference": "201d0e050dca336c44f93657ce1f34f3b3868432", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/c864e7f9b8d1e1f5f60acc3beda11299f637aded", + "reference": "c864e7f9b8d1e1f5f60acc3beda11299f637aded", "shasum": "" }, "require": { "doctrine/inflector": "^1.2", "nikic/php-parser": "^4.0", "php": "^7.0.8", - "symfony/config": "^3.4|^4.0", - "symfony/console": "^3.4|^4.0", - "symfony/dependency-injection": "^3.4|^4.0", - "symfony/filesystem": "^3.4|^4.0", - "symfony/finder": "^3.4|^4.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/http-kernel": "^3.4|^4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/console": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/filesystem": "^3.4|^4.0|^5.0", + "symfony/finder": "^3.4|^4.0|^5.0", + "symfony/framework-bundle": "^3.4|^4.0|^5.0", + "symfony/http-kernel": "^3.4|^4.0|^5.0" }, "require-dev": { - "doctrine/doctrine-bundle": "^1.8", + "doctrine/doctrine-bundle": "^1.8|^2.0", "doctrine/orm": "^2.3", "friendsofphp/php-cs-fixer": "^2.8", "friendsoftwig/twigcs": "^3.1.2", - "symfony/http-client": "^4.3", - "symfony/phpunit-bridge": "^3.4.19|^4.0", - "symfony/process": "^3.4|^4.0", - "symfony/security-core": "^3.4|^4.0", - "symfony/yaml": "^3.4|^4.0" + "symfony/http-client": "^4.3|^5.0", + "symfony/phpunit-bridge": "^4.3|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/security-core": "^3.4|^4.0|^5.0", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "type": "symfony-bundle", "extra": { @@ -4918,20 +4964,20 @@ "scaffold", "scaffolding" ], - "time": "2019-07-09 22:19:18" + "time": "2019-11-07 00:56:03" }, { "name": "symfony/phpunit-bridge", - "version": "v3.4.29", + "version": "v3.4.35", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "521489968e58dcdb8df153436cc18349737e49e3" + "reference": "cbea8818e9f34e4e9d780bd22bdda21b57d4d5c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/521489968e58dcdb8df153436cc18349737e49e3", - "reference": "521489968e58dcdb8df153436cc18349737e49e3", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/cbea8818e9f34e4e9d780bd22bdda21b57d4d5c7", + "reference": "cbea8818e9f34e4e9d780bd22bdda21b57d4d5c7", "shasum": "" }, "require": { @@ -4983,7 +5029,7 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2019-06-26 10:03:25" + "time": "2019-09-30 20:33:19" } ], "aliases": [], diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 5130ff92..56707b5d 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}CqD7Yyh4UJXaQKOfEdvF1diU7vvDmj8V +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}oIZgb8jC4L72wg4rgK+xfzdfPiy2Z8BA ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png index 8a2d430c..ef1b8a68 100644 Binary files a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png differ diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png index 8a2d430c..ef1b8a68 100644 Binary files a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png differ diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php index 84c9cabf..a92e576b 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/SynchroICSCommand.php @@ -119,7 +119,7 @@ class CalFileParser { if(isset($options["proxy"])) { $aContext = array( 'http' => array( - 'proxy' => 'tcp://'.$options["proxy"], + 'proxy' => 'http://'.$options["proxy"], 'request_fulluri' => true, 'timeout' => 5 ), diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index b2f4f876..fa2b8b91 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -921,7 +921,7 @@ class PagewidgetController extends Controller if($PROXYactivate) { $PROXYserver = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); $PROXYport = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); - $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport])); + $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'http://'.$PROXYserver.':'.$PROXYport,'https' => 'http://'.$PROXYserver.':'.$PROXYport])); } else $clientguzzle = new \GuzzleHttp\Client(['timeout' => 3,'verify'=>false]); @@ -1126,7 +1126,7 @@ class PagewidgetController extends Controller if($PROXYactivate) { $PROXYserver = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); $PROXYport = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); - $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport])); + $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'http://'.$PROXYserver.':'.$PROXYport,'https' => 'http://'.$PROXYserver.':'.$PROXYport])); } else $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false));