diff --git a/bin/cake b/bin/cake index 6801c45..2547a4f 100755 --- a/bin/cake +++ b/bin/cake @@ -3,17 +3,17 @@ # # Cake is a shell script for invoking CakePHP shell commands # -# CakePHP(tm) : Rapid Development Framework (http://cakephp.org) -# Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) +# CakePHP(tm) : Rapid Development Framework (https://cakephp.org) +# Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org) # # Licensed under The MIT License # For full copyright and license information, please see the LICENSE.txt # Redistributions of files must retain the above copyright notice. # -# @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) -# @link http://cakephp.org CakePHP(tm) Project +# @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org) +# @link https://cakephp.org CakePHP(tm) Project # @since 1.2.0 -# @license http://www.opensource.org/licenses/mit-license.php MIT License +# @license https://opensource.org/licenses/mit-license.php MIT License # ################################################################################ diff --git a/bin/cake-old b/bin/cake-old new file mode 100755 index 0000000..6801c45 --- /dev/null +++ b/bin/cake-old @@ -0,0 +1,46 @@ +#!/usr/bin/env sh +################################################################################ +# +# Cake is a shell script for invoking CakePHP shell commands +# +# CakePHP(tm) : Rapid Development Framework (http://cakephp.org) +# Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) +# +# Licensed under The MIT License +# For full copyright and license information, please see the LICENSE.txt +# Redistributions of files must retain the above copyright notice. +# +# @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) +# @link http://cakephp.org CakePHP(tm) Project +# @since 1.2.0 +# @license http://www.opensource.org/licenses/mit-license.php MIT License +# +################################################################################ + +# Canonicalize by following every symlink of the given name recursively +canonicalize() { + NAME="$1" + if [ -f "$NAME" ] + then + DIR=$(dirname -- "$NAME") + NAME=$(cd -P "$DIR" > /dev/null && pwd -P)/$(basename -- "$NAME") + fi + while [ -h "$NAME" ]; do + DIR=$(dirname -- "$NAME") + SYM=$(readlink "$NAME") + NAME=$(cd "$DIR" > /dev/null && cd $(dirname -- "$SYM") > /dev/null && pwd)/$(basename -- "$SYM") + done + echo "$NAME" +} + +CONSOLE=$(dirname -- "$(canonicalize "$0")") +APP=$(dirname "$CONSOLE") + +if [ $(basename $0) != 'cake' ] +then + exec php "$CONSOLE"/cake.php $(basename $0) "$@" +else + exec php "$CONSOLE"/cake.php "$@" +fi + +exit diff --git a/composer.json b/composer.json index 0efa579..8ff3a96 100644 --- a/composer.json +++ b/composer.json @@ -6,12 +6,11 @@ "license": "MIT", "require": { "php": ">=5.5.9", - "cakephp/cakephp": "3.3.*", + "cakephp/cakephp": "3.6.*", "mobiledetect/mobiledetectlib": "2.*", "cakephp/migrations": "~1.0", "cakephp/plugin-installer": "*", "sunra/php-simple-html-dom-parser": "^1.5", - "microweber/screen": "^1.0", "spatie/array-to-xml": "^2.7" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 31bf340..11056d7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,117 +4,43 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "79fd1d043d7eab2b06b0d2048bb23b4b", - "content-hash": "03aef8e54d6317ce26f0dbe72aff1ebb", + "content-hash": "211736ac94b6bf2152703e36516b870b", "packages": [ - { - "name": "aura/installer-default", - "version": "1.0.0", - "source": { - "type": "git", - "url": "https://github.com/auraphp/installer-default.git", - "reference": "52f8de3670cc1ef45a916f40f732937436d028c8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/auraphp/installer-default/zipball/52f8de3670cc1ef45a916f40f732937436d028c8", - "reference": "52f8de3670cc1ef45a916f40f732937436d028c8", - "shasum": "" - }, - "type": "composer-installer", - "extra": { - "class": "Aura\\Composer\\DefaultInstaller" - }, - "autoload": { - "psr-0": { - "Aura\\Composer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Paul M. Jones", - "email": "pmjones88@gmail.com", - "homepage": "http://paul-m-jones.com" - } - ], - "description": "Installs Aura packages using the Composer defaults.", - "keywords": [ - "aura", - "installer" - ], - "time": "2012-11-26 21:35:57" - }, { "name": "aura/intl", - "version": "1.1.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/auraphp/Aura.Intl.git", - "reference": "c5fe620167550ad6fa77dd3570fba2efc77a2a21" + "reference": "7fce228980b19bf4dee2d7bbd6202a69b0dde926" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/auraphp/Aura.Intl/zipball/c5fe620167550ad6fa77dd3570fba2efc77a2a21", - "reference": "c5fe620167550ad6fa77dd3570fba2efc77a2a21", + "url": "https://api.github.com/repos/auraphp/Aura.Intl/zipball/7fce228980b19bf4dee2d7bbd6202a69b0dde926", + "reference": "7fce228980b19bf4dee2d7bbd6202a69b0dde926", "shasum": "" }, "require": { - "aura/installer-default": "1.0.*", - "php": ">=5.4.0" - }, - "type": "aura-package", - "extra": { - "aura": { - "type": "library", - "config": { - "common": "Aura\\Intl\\_Config\\Common" - } - }, - "branch-alias": { - "dev-develop": "1.1.x-dev" - } + "php": "^5.6|^7.0" }, + "type": "library", "autoload": { - "psr-0": { - "Aura\\Intl": "src/" - }, "psr-4": { - "Aura\\Intl\\_Config\\": "config/" + "Aura\\Intl\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-2-Clause" + "MIT" ], "authors": [ - { - "name": "Paul M. Jones", - "email": "pmjones88@gmail.com", - "homepage": "http://paul-m-jones.com" - }, { "name": "Aura.Intl Contributors", "homepage": "https://github.com/auraphp/Aura.Intl/contributors" - }, - { - "name": "Pascal Borreli", - "email": "pascal@borreli.com" - }, - { - "name": "Mapthegod", - "email": "mapthegod@gmail.com" - }, - { - "name": "Jose Lorenzo Rodriguez", - "email": "jose.zap@gmail.com" } ], - "description": "The Aura.Intl package provides internationalization (I18N) tools, specifically\npackage-oriented per-locale message translation.", - "homepage": "http://auraphp.com/Aura.Intl", + "description": "The Aura Intl package provides internationalization tools, specifically message translation.", + "homepage": "https://github.com/auraphp/Aura.Intl", "keywords": [ "g11n", "globalization", @@ -124,30 +50,33 @@ "l10n", "localization" ], - "time": "2014-08-24 00:00:00" + "time": "2017-01-20T05:00:11+00:00" }, { "name": "cakephp/cakephp", - "version": "3.3.16", + "version": "3.6.11", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "11a5ae91ef03e3ff8a9c6d410fdb1cc98e0f57f3" + "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/11a5ae91ef03e3ff8a9c6d410fdb1cc98e0f57f3", - "reference": "11a5ae91ef03e3ff8a9c6d410fdb1cc98e0f57f3", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d", + "reference": "ddbfcdb479cfaa59f6e8c3433bf85aa71bff492d", "shasum": "" }, "require": { - "aura/intl": "1.1.*", - "cakephp/chronos": "~1.0", + "aura/intl": "^3.0.0", + "cakephp/chronos": "^1.0.1", "ext-intl": "*", "ext-mbstring": "*", - "php": ">=5.5.9", - "psr/log": "^1.0", - "zendframework/zend-diactoros": "^1.4" + "php": ">=5.6.0", + "psr/log": "^1.0.0", + "zendframework/zend-diactoros": "^1.4.0" + }, + "conflict": { + "phpunit/phpunit": "<5.7" }, "replace": { "cakephp/cache": "self.version", @@ -165,16 +94,17 @@ "cakephp/validation": "self.version" }, "require-dev": { - "cakephp/cakephp-codesniffer": "~2.1", - "phpunit/phpunit": "<6.0" + "cakephp/cakephp-codesniffer": "^3.0", + "phpunit/phpunit": "^5.7.14|^6.0" }, "suggest": { - "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation." + "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.", + "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()" }, "type": "library", "autoload": { "psr-4": { - "Cake\\": "src" + "Cake\\": "src/" }, "files": [ "src/Core/functions.php", @@ -194,24 +124,32 @@ } ], "description": "The CakePHP framework", - "homepage": "http://cakephp.org", + "homepage": "https://cakephp.org", "keywords": [ - "framework" + "conventions over configuration", + "dry", + "form", + "framework", + "mvc", + "orm", + "psr-7", + "rapid-development", + "validation" ], - "time": "2017-04-07 02:04:27" + "time": "2018-09-03T01:33:56+00:00" }, { "name": "cakephp/chronos", - "version": "1.1.4", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/cakephp/chronos.git", - "reference": "85bcaea6a832684b32ef54b2487b0c14a172e9e6" + "reference": "30f5b26bcf76a5e53ecc274700ad1ec49dc05567" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/chronos/zipball/85bcaea6a832684b32ef54b2487b0c14a172e9e6", - "reference": "85bcaea6a832684b32ef54b2487b0c14a172e9e6", + "url": "https://api.github.com/repos/cakephp/chronos/zipball/30f5b26bcf76a5e53ecc274700ad1ec49dc05567", + "reference": "30f5b26bcf76a5e53ecc274700ad1ec49dc05567", "shasum": "" }, "require": { @@ -219,15 +157,15 @@ }, "require-dev": { "athletic/athletic": "~0.1", - "cakephp/cakephp-codesniffer": "~2.3", + "cakephp/cakephp-codesniffer": "^3.0", "phpbench/phpbench": "@dev", "phpstan/phpstan": "^0.6.4", - "phpunit/phpunit": "<6.0" + "phpunit/phpunit": "<6.0 || ^7.0" }, "type": "library", "autoload": { "psr-4": { - "Cake\\Chronos\\": "src" + "Cake\\Chronos\\": "src/" }, "files": [ "src/carbon_compat.php" @@ -255,7 +193,7 @@ "datetime", "time" ], - "time": "2018-01-13 12:19:50" + "time": "2018-07-11T18:51:56+00:00" }, { "name": "cakephp/migrations", @@ -308,7 +246,7 @@ "cakephp", "migrations" ], - "time": "2017-12-12 21:01:38" + "time": "2017-12-12T21:01:38+00:00" }, { "name": "cakephp/plugin-installer", @@ -349,71 +287,20 @@ } ], "description": "A composer installer for CakePHP 3.0+ plugins.", - "time": "2017-12-24 21:09:29" - }, - { - "name": "microweber/screen", - "version": "v1.0.6", - "source": { - "type": "git", - "url": "https://github.com/microweber/screen.git", - "reference": "a7865099d2fbb8960052cfb408b4cbe463b31774" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/microweber/screen/zipball/a7865099d2fbb8960052cfb408b4cbe463b31774", - "reference": "a7865099d2fbb8960052cfb408b4cbe463b31774", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "require-dev": { - "symfony/var-dumper": "~3.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Screen\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Peter Ivanov", - "email": "peter@microweber.com", - "homepage": "http://microweber.com" - }, - { - "name": "André Filipe", - "email": "andre.r.flip@gmail.com", - "homepage": "http://masnathan.com" - } - ], - "description": "A PHP Class to interact with PhantomJs and capture screenshot of a webpage", - "keywords": [ - "capture", - "phantomjs", - "print-screen", - "screen" - ], - "time": "2017-01-20 15:21:43" + "time": "2017-12-24T21:09:29+00:00" }, { "name": "mobiledetect/mobiledetectlib", - "version": "2.8.31", + "version": "2.8.33", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "adb882ea3b9d154f087ecb2c333180dad6f4dd37" + "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/adb882ea3b9d154f087ecb2c333180dad6f4dd37", - "reference": "adb882ea3b9d154f087ecb2c333180dad6f4dd37", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/cd385290f9a0d609d2eddd165a1e44ec1bf12102", + "reference": "cd385290f9a0d609d2eddd165a1e44ec1bf12102", "shasum": "" }, "require": { @@ -452,7 +339,7 @@ "mobile detector", "php mobile detect" ], - "time": "2018-02-26 19:39:55" + "time": "2018-09-01T15:05:15+00:00" }, { "name": "psr/http-message", @@ -502,7 +389,7 @@ "request", "response" ], - "time": "2016-08-06 14:39:51" + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -549,7 +436,7 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "robmorgan/phinx", @@ -615,20 +502,20 @@ "migrations", "phinx" ], - "time": "2017-06-05 13:30:19" + "time": "2017-06-05T13:30:19+00:00" }, { "name": "spatie/array-to-xml", - "version": "2.7.1", + "version": "2.7.2", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "cb8befcd0c58ccf8baa5491e61a5c1d02a3acbba" + "reference": "2b01cb1a04b4b65f0db03cd8a78df4b978fe5cd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/cb8befcd0c58ccf8baa5491e61a5c1d02a3acbba", - "reference": "cb8befcd0c58ccf8baa5491e61a5c1d02a3acbba", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/2b01cb1a04b4b65f0db03cd8a78df4b978fe5cd7", + "reference": "2b01cb1a04b4b65f0db03cd8a78df4b978fe5cd7", "shasum": "" }, "require": { @@ -664,7 +551,7 @@ "convert", "xml" ], - "time": "2018-02-20 15:21:24" + "time": "2018-09-17T11:45:05+00:00" }, { "name": "sunra/php-simple-html-dom-parser", @@ -712,25 +599,26 @@ "html", "parser" ], - "time": "2016-11-22 22:57:47" + "time": "2016-11-22T22:57:47+00:00" }, { "name": "symfony/config", - "version": "v3.4.8", + "version": "v3.4.16", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9" + "reference": "e5389132dc6320682de3643091121c048ff796b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7c2a9d44f4433863e9bca682e7f03609234657f9", - "reference": "7c2a9d44f4433863e9bca682e7f03609234657f9", + "url": "https://api.github.com/repos/symfony/config/zipball/e5389132dc6320682de3643091121c048ff796b3", + "reference": "e5389132dc6320682de3643091121c048ff796b3", "shasum": "" }, "require": { "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0" + "symfony/filesystem": "~2.8|~3.0|~4.0", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/dependency-injection": "<3.3", @@ -775,20 +663,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-03-19 22:32:39" + "time": "2018-09-08T13:15:14+00:00" }, { "name": "symfony/console", - "version": "v3.4.8", + "version": "v3.4.16", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf" + "reference": "1cbaac35024c9dfc9612b7e2310e82677bf85709" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", - "reference": "d4bb70fa24d540c309d88a9d6e43fb2d339b1fbf", + "url": "https://api.github.com/repos/symfony/console/zipball/1cbaac35024c9dfc9612b7e2310e82677bf85709", + "reference": "1cbaac35024c9dfc9612b7e2310e82677bf85709", "shasum": "" }, "require": { @@ -809,7 +697,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -844,20 +732,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-04-03 05:22:50" + "time": "2018-09-30T03:37:36+00:00" }, { "name": "symfony/debug", - "version": "v4.0.8", + "version": "v4.1.5", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5961d02d48828671f5d8a7805e06579d692f6ede" + "reference": "b4a0b67dee59e2cae4449a8f8eabc508d622fd33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede", - "reference": "5961d02d48828671f5d8a7805e06579d692f6ede", + "url": "https://api.github.com/repos/symfony/debug/zipball/b4a0b67dee59e2cae4449a8f8eabc508d622fd33", + "reference": "b4a0b67dee59e2cae4449a8f8eabc508d622fd33", "shasum": "" }, "require": { @@ -873,7 +761,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -900,29 +788,30 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-04-03 05:24:00" + "time": "2018-09-22T19:04:12+00:00" }, { "name": "symfony/filesystem", - "version": "v4.0.8", + "version": "v4.1.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21" + "reference": "a10ae719b02c47ecba5c684ca2b505f3a49bf397" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/a10ae719b02c47ecba5c684ca2b505f3a49bf397", + "reference": "a10ae719b02c47ecba5c684ca2b505f3a49bf397", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -949,20 +838,78 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-02-22 10:50:29" + "time": "2018-09-30T03:38:13+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "name": "symfony/polyfill-ctype", + "version": "v1.9.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", + "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.9-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-08-06T14:22:27+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.9.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", + "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", "shasum": "" }, "require": { @@ -974,7 +921,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -1008,24 +955,25 @@ "portable", "shim" ], - "time": "2018-01-30 19:27:44" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/yaml", - "version": "v3.4.8", + "version": "v3.4.16", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0" + "reference": "61973ecda60e9f3561e929e19c07d4878b960fc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/a42f9da85c7c38d59f5e53f076fe81a091f894d0", - "reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0", + "url": "https://api.github.com/repos/symfony/yaml/zipball/61973ecda60e9f3561e929e19c07d4878b960fc1", + "reference": "61973ecda60e9f3561e929e19c07d4878b960fc1", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^5.5.9|>=7.0.8", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" @@ -1066,20 +1014,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-04-03 05:14:20" + "time": "2018-09-24T08:15:45+00:00" }, { "name": "zendframework/zend-diactoros", - "version": "1.7.1", + "version": "1.8.6", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1" + "reference": "20da13beba0dde8fb648be3cc19765732790f46e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/20da13beba0dde8fb648be3cc19765732790f46e", + "reference": "20da13beba0dde8fb648be3cc19765732790f46e", "shasum": "" }, "require": { @@ -1092,17 +1040,29 @@ "require-dev": { "ext-dom": "*", "ext-libxml": "*", - "phpunit/phpunit": "^5.7.16 || ^6.0.8", + "php-http/psr7-integration-tests": "dev-master", + "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7", "zendframework/zend-coding-standard": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev", - "dev-develop": "1.8.x-dev" + "dev-master": "1.8.x-dev", + "dev-develop": "1.9.x-dev", + "dev-release-2.0": "2.0.x-dev" } }, "autoload": { + "files": [ + "src/functions/create_uploaded_file.php", + "src/functions/marshal_headers_from_sapi.php", + "src/functions/marshal_method_from_sapi.php", + "src/functions/marshal_protocol_version_from_sapi.php", + "src/functions/marshal_uri_from_sapi.php", + "src/functions/normalize_server.php", + "src/functions/normalize_uploaded_files.php", + "src/functions/parse_cookie_header.php" + ], "psr-4": { "Zend\\Diactoros\\": "src/" } @@ -1118,7 +1078,7 @@ "psr", "psr-7" ], - "time": "2018-02-26 15:44:50" + "time": "2018-09-05T19:29:37+00:00" } ], "packages-dev": [ @@ -1167,7 +1127,7 @@ "bake", "cakephp" ], - "time": "2017-01-31 00:59:03" + "time": "2017-01-31T00:59:03+00:00" }, { "name": "cakephp/debug_kit", @@ -1226,20 +1186,20 @@ "debug", "kit" ], - "time": "2017-05-02 01:12:10" + "time": "2017-05-02T01:12:10+00:00" }, { "name": "composer/ca-bundle", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169" + "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169", - "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/46afded9720f40b9dc63542af4e3e43a1177acb0", + "reference": "46afded9720f40b9dc63542af4e3e43a1177acb0", "shasum": "" }, "require": { @@ -1282,30 +1242,30 @@ "ssl", "tls" ], - "time": "2018-03-29 19:57:20" + "time": "2018-08-08T08:57:40+00:00" }, { "name": "composer/composer", - "version": "1.6.3", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2" + "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/88a69fda0f2187ad8714cedffd7a8872dceaa4c2", - "reference": "88a69fda0f2187ad8714cedffd7a8872dceaa4c2", + "url": "https://api.github.com/repos/composer/composer/zipball/576aab9b5abb2ed11a1c52353a759363216a4ad2", + "reference": "576aab9b5abb2ed11a1c52353a759363216a4ad2", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", "composer/spdx-licenses": "^1.2", + "composer/xdebug-handler": "^1.1", "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "php": "^5.3.2 || ^7.0", "psr/log": "^1.0", - "seld/cli-prompt": "^1.0", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.0", "symfony/console": "^2.7 || ^3.0 || ^4.0", @@ -1313,6 +1273,9 @@ "symfony/finder": "^2.7 || ^3.0 || ^4.0", "symfony/process": "^2.7 || ^3.0 || ^4.0" }, + "conflict": { + "symfony/console": "2.8.38" + }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7", "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" @@ -1328,7 +1291,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -1359,7 +1322,7 @@ "dependency", "package" ], - "time": "2018-01-31 15:28:18" + "time": "2018-08-16T14:57:12+00:00" }, { "name": "composer/semver", @@ -1421,20 +1384,20 @@ "validation", "versioning" ], - "time": "2016-08-30 16:08:34" + "time": "2016-08-30T16:08:34+00:00" }, { "name": "composer/spdx-licenses", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/composer/spdx-licenses.git", - "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30" + "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/7e111c50db92fa2ced140f5ba23b4e261bc77a30", - "reference": "7e111c50db92fa2ced140f5ba23b4e261bc77a30", + "url": "https://api.github.com/repos/composer/spdx-licenses/zipball/cb17687e9f936acd7e7245ad3890f953770dec1b", + "reference": "cb17687e9f936acd7e7245ad3890f953770dec1b", "shasum": "" }, "require": { @@ -1482,7 +1445,51 @@ "spdx", "validator" ], - "time": "2018-01-31 13:17:27" + "time": "2018-04-30T10:33:04+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/b8e9745fb9b06ea6664d8872c4505fb16df4611c", + "reference": "b8e9745fb9b06ea6664d8872c4505fb16df4611c", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0", + "psr/log": "^1.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "time": "2018-08-31T19:07:57+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -1515,36 +1522,36 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24 07:27:01" + "time": "2014-10-24T07:27:01+00:00" }, { "name": "jakub-onderka/php-console-color", - "version": "0.1", + "version": "v0.2", "source": { "type": "git", "url": "https://github.com/JakubOnderka/PHP-Console-Color.git", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1" + "reference": "d5deaecff52a0d61ccb613bb3804088da0307191" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/e0b393dacf7703fc36a4efc3df1435485197e6c1", - "reference": "e0b393dacf7703fc36a4efc3df1435485197e6c1", + "url": "https://api.github.com/repos/JakubOnderka/PHP-Console-Color/zipball/d5deaecff52a0d61ccb613bb3804088da0307191", + "reference": "d5deaecff52a0d61ccb613bb3804088da0307191", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": ">=5.4.0" }, "require-dev": { "jakub-onderka/php-code-style": "1.0", - "jakub-onderka/php-parallel-lint": "0.*", + "jakub-onderka/php-parallel-lint": "1.0", "jakub-onderka/php-var-dump-check": "0.*", - "phpunit/phpunit": "3.7.*", + "phpunit/phpunit": "~4.3", "squizlabs/php_codesniffer": "1.*" }, "type": "library", "autoload": { - "psr-0": { - "JakubOnderka\\PhpConsoleColor": "src/" + "psr-4": { + "JakubOnderka\\PhpConsoleColor\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1554,11 +1561,10 @@ "authors": [ { "name": "Jakub Onderka", - "email": "jakub.onderka@gmail.com", - "homepage": "http://www.acci.cz" + "email": "jakub.onderka@gmail.com" } ], - "time": "2014-04-08 15:00:19" + "time": "2018-09-29T17:23:10+00:00" }, { "name": "jakub-onderka/php-console-highlighter", @@ -1602,7 +1608,7 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20 18:58:01" + "time": "2015-04-20T18:58:01+00:00" }, { "name": "jdorn/sql-formatter", @@ -1652,7 +1658,7 @@ "highlight", "sql" ], - "time": "2014-01-12 16:20:24" + "time": "2014-01-12T16:20:24+00:00" }, { "name": "justinrainbow/json-schema", @@ -1718,28 +1724,28 @@ "json", "schema" ], - "time": "2018-02-14 22:26:30" + "time": "2018-02-14T22:26:30+00:00" }, { "name": "nikic/php-parser", - "version": "v3.1.5", + "version": "v4.0.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce" + "reference": "fa6ee28600d21d49b2b4e1006b48426cec8e579c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", - "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fa6ee28600d21d49b2b4e1006b48426cec8e579c", + "reference": "fa6ee28600d21d49b2b4e1006b48426cec8e579c", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.5" + "php": ">=7.0" }, "require-dev": { - "phpunit/phpunit": "~4.0|~5.0" + "phpunit/phpunit": "^6.5 || ^7.0" }, "bin": [ "bin/php-parse" @@ -1747,7 +1753,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1769,34 +1775,36 @@ "parser", "php" ], - "time": "2018-02-28 20:30:58" + "time": "2018-09-18T07:03:24+00:00" }, { "name": "psy/psysh", - "version": "v0.8.18", + "version": "v0.9.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834" + "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/5357b1cffc8fb375d6a9e3c86d5c82dd38a40834", - "reference": "5357b1cffc8fb375d6a9e3c86d5c82dd38a40834", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", + "reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555", "shasum": "" }, "require": { "dnoegel/php-xdg-base-dir": "0.1", + "ext-json": "*", + "ext-tokenizer": "*", "jakub-onderka/php-console-highlighter": "0.3.*", - "nikic/php-parser": "~1.3|~2.0|~3.0", - "php": ">=5.3.9", + "nikic/php-parser": "~1.3|~2.0|~3.0|~4.0", + "php": ">=5.4.0", "symfony/console": "~2.3.10|^2.4.2|~3.0|~4.0", "symfony/var-dumper": "~2.7|~3.0|~4.0" }, "require-dev": { - "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "^4.8.35|^5.4.3", - "symfony/finder": "~2.1|~3.0|~4.0" + "bamarni/composer-bin-plugin": "^1.2", + "hoa/console": "~2.15|~3.16", + "phpunit/phpunit": "~4.8.35|~5.0|~6.0|~7.0" }, "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", @@ -1811,15 +1819,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "0.8.x-dev" + "dev-develop": "0.9.x-dev" } }, "autoload": { "files": [ - "src/Psy/functions.php" + "src/functions.php" ], "psr-4": { - "Psy\\": "src/Psy/" + "Psy\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1841,55 +1849,7 @@ "interactive", "shell" ], - "time": "2018-04-02 05:41:44" - }, - { - "name": "seld/cli-prompt", - "version": "1.0.3", - "source": { - "type": "git", - "url": "https://github.com/Seldaek/cli-prompt.git", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd", - "shasum": "" - }, - "require": { - "php": ">=5.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Seld\\CliPrompt\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be" - } - ], - "description": "Allows you to prompt for user input on the command line, and optionally hide the characters they type", - "keywords": [ - "cli", - "console", - "hidden", - "input", - "prompt" - ], - "time": "2017-03-18 11:32:45" + "time": "2018-09-05T11:40:09+00:00" }, { "name": "seld/jsonlint", @@ -1938,7 +1898,7 @@ "parser", "validator" ], - "time": "2018-01-24 12:46:19" + "time": "2018-01-24T12:46:19+00:00" }, { "name": "seld/phar-utils", @@ -1982,20 +1942,20 @@ "keywords": [ "phra" ], - "time": "2015-10-13 18:44:15" + "time": "2015-10-13T18:44:15+00:00" }, { "name": "symfony/finder", - "version": "v4.0.8", + "version": "v4.1.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" + "reference": "f0b042d445c155501793e7b8007457f9f5bb1c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "url": "https://api.github.com/repos/symfony/finder/zipball/f0b042d445c155501793e7b8007457f9f5bb1c8c", + "reference": "f0b042d445c155501793e7b8007457f9f5bb1c8c", "shasum": "" }, "require": { @@ -2004,7 +1964,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2031,20 +1991,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-04-04 05:10:37" + "time": "2018-09-21T12:49:42+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.7.0", + "version": "v1.9.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" + "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/95c50420b0baed23852452a7f0c7b527303ed5ae", + "reference": "95c50420b0baed23852452a7f0c7b527303ed5ae", "shasum": "" }, "require": { @@ -2053,7 +2013,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -2086,20 +2046,20 @@ "portable", "shim" ], - "time": "2018-01-31 17:43:24" + "time": "2018-08-06T14:22:27+00:00" }, { "name": "symfony/process", - "version": "v4.0.8", + "version": "v4.1.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25" + "reference": "c64647828bc7733ba9427f1eeb1b542588635427" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", - "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", + "url": "https://api.github.com/repos/symfony/process/zipball/c64647828bc7733ba9427f1eeb1b542588635427", + "reference": "c64647828bc7733ba9427f1eeb1b542588635427", "shasum": "" }, "require": { @@ -2108,7 +2068,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2135,20 +2095,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-04-03 05:24:00" + "time": "2018-09-08T13:24:10+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.0.8", + "version": "v4.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0" + "reference": "1509020968321c1d46408c11c142a2388b1c9b0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e1b4d008100f4d203cc38b0d793ad6252d8d8af0", - "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1509020968321c1d46408c11c142a2388b1c9b0c", + "reference": "1509020968321c1d46408c11c142a2388b1c9b0c", "shasum": "" }, "require": { @@ -2157,20 +2117,26 @@ "symfony/polyfill-php72": "~1.5" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", + "symfony/console": "<3.4" }, "require-dev": { "ext-iconv": "*", + "symfony/process": "~3.4|~4.0", "twig/twig": "~1.34|~2.4" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", - "ext-intl": "To show region name in time zone dump" + "ext-intl": "To show region name in time zone dump", + "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" }, + "bin": [ + "Resources/bin/var-dump-server" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2204,7 +2170,7 @@ "debug", "dump" ], - "time": "2018-04-04 05:10:37" + "time": "2018-09-18T12:45:12+00:00" } ], "aliases": [], diff --git a/config/bootstrap.php b/config/bootstrap.php index c2b8b5d..4bd1cfd 100644 --- a/config/bootstrap.php +++ b/config/bootstrap.php @@ -150,12 +150,12 @@ if (!Configure::read('App.fullBaseUrl')) { unset($httpHost, $s); } -Cache::config(Configure::consume('Cache')); -ConnectionManager::config(Configure::consume('Datasources')); -Email::configTransport(Configure::consume('EmailTransport')); -Email::config(Configure::consume('Email')); -Log::config(Configure::consume('Log')); -Security::salt(Configure::consume('Security.salt')); +Cache::setConfig(Configure::consume('Cache')); +ConnectionManager::setConfig(Configure::consume('Datasources')); +Email::setConfigTransport(Configure::consume('EmailTransport')); +Email::setConfig(Configure::consume('Email')); +Log::setConfig(Configure::consume('Log')); +Security::setSalt(Configure::consume('Security.salt')); /* * The default crypto extension in 3.0 is OpenSSL. @@ -215,6 +215,8 @@ Type::build('timestamp') * */ +Plugin::load('Migrations'); + /* * Only try to load DebugKit in development mode * Debug Kit should not be installed on a production system diff --git a/plugins/AsdCurl/config/bootstrap.php b/plugins/AsdCurl/config/bootstrap.php index 266b8cc..3ee20f3 100644 --- a/plugins/AsdCurl/config/bootstrap.php +++ b/plugins/AsdCurl/config/bootstrap.php @@ -17,11 +17,14 @@ define('SCHULPORTAL_ASD_BASE_URL', SCHULPORTAL_BASE0_URL . '/uniquesigc3ba168505 define('SCHULPORTAL_MSTR_BASE_URL', SCHULPORTAL_BASE0_URL . '/uniquesig182e937bef9540ecffb7e0ba167caaea052491068bd93a46e70dbd73bf9f8963/uniquesig1/asd'); -Configure::write('AsdCurl.proxy','10.1.248.1:82'); +//Configure::write('AsdCurl.proxy','10.1.248.1:82'); +//Configure::write('AsdCurl.proxy','www.proxy.bybn.de:80'); +Configure::write('AsdCurl.proxy','127.0.0.1:8080'); Configure::write('AsdCurl.cookiejar', '/tmp/cookies.txt'); Configure::write('AsdCurl.cookiefile', '/tmp/cookies.txt'); Configure::write('AsdCurl.cookie', 'cookiename=cookievalue'); Configure::write('AsdCurl.useragent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:28.0) Gecko/20100101 Firefox/28.0'); +//Configure::write('AsdCurl.useragent', 'Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.67 Safari/537.36'); Configure::write('AsdCurl.cert','/var/www/html/ssl_KM_Z2016_asd.trinkl.pem'); Configure::write('AsdCurl.schulbase0url',SCHULPORTAL_BASE0_URL); Configure::write('AsdCurl.schulbaseurl',SCHULPORTAL_BASE_URL); diff --git a/plugins/AsdCurl/src/AsdCurl.php b/plugins/AsdCurl/src/AsdCurl.php index 6848477..9b9c25d 100644 --- a/plugins/AsdCurl/src/AsdCurl.php +++ b/plugins/AsdCurl/src/AsdCurl.php @@ -22,11 +22,14 @@ class AsdCurl public function init_curl_params() { - $ch = curl_init(); - curl_setopt($ch, CURLOPT_PROXY, Configure::read('AsdCurl.proxy')); + $ch = curl_init('https://portal.schulen.bayern.de/'); + //curl_setopt($ch, CURLOPT_PROXY, Configure::read('AsdCurl.proxy')); + //curl_setopt($ch, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5); + curl_setopt($ch, CURLOPT_PROXY, ""); curl_setopt($ch, CURLOPT_USERAGENT, Configure::read('AsdCurl.useragent')); curl_setopt($ch, CURLOPT_HEADER, false); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + //curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_COOKIESESSION, true); curl_setopt($ch, CURLOPT_COOKIEJAR, Configure::read('AsdCurl.cookiejar')); @@ -58,6 +61,7 @@ class AsdCurl public function exec_curl($ch, $url, $post) { + //debug($url);die; if ($post == false) { curl_setopt($ch, CURLOPT_POST, 0); curl_setopt($ch, CURLOPT_HTTPHEADER, array()); @@ -68,6 +72,8 @@ class AsdCurl } curl_setopt($ch, CURLOPT_URL, $url); $this->html = curl_exec($ch); + //echo 'Hallo'; + //echo $this->html;die; //debug(curl_errno($ch)); //debug(curl_getinfo($ch, CURLINFO_HTTP_CODE)); if (curl_errno($ch)) { @@ -93,7 +99,9 @@ class AsdCurl $login_data = [ 'asd_username' => 'A005_TrinklW', - 'asd_password' => 'HiegTzs!12', + 'asd_password' => 'HiegTzs!183', + //'asd_username' => 'A005_KnollmüllerP', + //'asd_password' => 'Ooricha8e!', ]; $post = [ 'login:username' => $login_data['asd_username'], @@ -108,6 +116,7 @@ class AsdCurl } $viewstate = $this->get_string_between($this->html, 'id="javax.faces.ViewState" value="', '" autocomplete'); Configure::write('Session', ['viewstate' => $viewstate]); + //echo $this->html;die; } public function login_mstr($ch) { @@ -154,17 +163,23 @@ class AsdCurl public function login_school($ch) { + //echo 'Hallo';die; $SCHULPORTAL_BASE0_URL = Configure::read('AsdCurl.schulbase0url'); + //$SCHULPORTAL_BASE0_URL = "https://portal.schulen.bayern.de/SecureSchulportalPortalHomePage"; $SCHULPORTAL_BASE_URL = Configure::read('AsdCurl.schulbaseurl'); + //$SCHULPORTAL_BASE_URL = Configure::read('AsdCurl.schulbaseurl') . '/SecureSchulportalPortalHomePage'; //$login_data = $this->request->session()->read('data'); + //echo $SCHULPORTAL_BASE_URL; + $this->exec_curl($ch, $SCHULPORTAL_BASE_URL, false); if(!($this->status)) { die($this->error); } + //echo $this->html; die; $login_data = [ 'portal_username' => 'asd.trinkl', - 'portal_password' => 'HiegTzs!182', + 'portal_password' => 'HiegTzs!184', ]; $post = [ @@ -178,10 +193,13 @@ class AsdCurl ]; // Anmeldeformular fuer das Schulportal abschicken - Step 2 +//https://portal.schulen.bayern.de/uniquesig2d1dfad4a11c25e42c462e53b4721e48/uniquesig0/SecureSchulportalPortalHomePage/ + //$this->exec_curl($ch, $SCHULPORTAL_BASE_URL . '/SecureSchulportalPortalHomePage', $post); $this->exec_curl($ch, $SCHULPORTAL_BASE_URL . '/InternalSite/Validate.asp', $post); if(!($this->status)) { die($this->error); } + //debug($this->html);die; } public function exec_mstr($ch, $url, $post) diff --git a/plugins/AsdCurl/src/AsdUs.php b/plugins/AsdCurl/src/AsdUs.php index 65b572b..5f46ef2 100644 --- a/plugins/AsdCurl/src/AsdUs.php +++ b/plugins/AsdCurl/src/AsdUs.php @@ -24,12 +24,13 @@ class AsdUs extends AsdCurl $post = [ 'sideMenu' => 'sideMenu', 'javax.faces.ViewState' => $viewstate, - 'sideMenu:j_idt51:0:j_idt57:1:j_idt59' => 'sideMenu:j_idt51:0:j_idt57:1:j_idt59', + 'sideMenu:j_idt52:0:j_idt58:1:j_idt60' => 'sideMenu:j_idt52:0:j_idt58:1:j_idt60', ]; $this->exec_curl($ch, $SCHULPORTAL_ASD_BASE_URL . '/asdus/us_00_00.jsf?cid=' . $conversationId, $post); if(!($this->status)) { die($this->error); } + //echo $this->html;die; // In Maske US 01 01 alle Felder leer lassen und "Suchen" ausführen $viewstate = $this->get_string_between($this->html, 'id="javax.faces.ViewState" value="', '" autocomplete'); $conversationId = $this->get_string_between($this->html, 'name="conversationId" value="', '" />'); @@ -52,6 +53,7 @@ class AsdUs extends AsdCurl 'mainForm:dienststelle_plzstrasse' => '', 'mainForm:dienststelle_ort' => '', 'mainForm:dienststelle_sat_kurz_bezeichnung' => 'EMPTY:0', + //'mainForm:dienststelle_sat_kurz_bezeichnung' => 'com.hp.asd.wl.domain.standard.SchulartRechtlich:747', 'mainForm:dienststelle_bdg_kurz_bezeichnung' => 'EMPTY:0', 'mainForm:dienststelle_wl_kurz_bezeichnung' => 'EMPTY:0', 'mainForm:dienststelle_dst_wl_regierung_id_u' => 'EMPTY:0', @@ -67,10 +69,12 @@ class AsdUs extends AsdCurl if(!($this->status)) { die($this->error); } + //echo $this->html; // Auf der Ergebnisseite auf "Alle" Klicken $viewstate = $this->get_string_between($this->html, 'id="javax.faces.ViewState" value="', '" autocomplete'); $conversationId = $this->get_string_between($this->html, 'name="conversationId" value="', '" />'); - //$mainform = $this->get_string_between($this->html, '\\\':\\\'', '\\\'},\\\'\\\')\');return false\" class=\"ignoreChangeNotification notBold\">ALLE'); + $mainform = $this->get_string_between($this->html, '\\\':\\\'', '\\\'},\\\'\\\')\')\;return false\" class=\"ignoreChangeNotification notBold\">ALLE'); + //debug($mainform);die; $post = [ 'mainForm' => 'mainForm', @@ -86,7 +90,7 @@ class AsdUs extends AsdCurl 'skipvalidation' => 'true', 'mainForm:istAnzeigeMaske' => 'false', 'javax.faces.ViewState' => $viewstate, - 'mainForm:j_idt189' => 'mainForm:j_idt189', + 'mainForm:j_idt184' => 'mainForm:j_idt184', ]; $this->exec_curl($ch, $SCHULPORTAL_ASD_BASE_URL . '/asdus/us_01_02.jsf?cid=' . $conversationId, $post); if(!($this->status)) { @@ -188,6 +192,7 @@ class AsdUs extends AsdCurl if(!($this->status)) { die($this->error); } + echo $this->html;die; // Auf der Ergebnisseite auf "Alle" Klicken $viewstate = $this->get_string_between($this->html, 'id="javax.faces.ViewState" value="', '" autocomplete'); $conversationId = $this->get_string_between($this->html, 'name="conversationId" value="', '" />'); @@ -207,7 +212,7 @@ class AsdUs extends AsdCurl 'skipvalidation' => 'true', 'mainForm:istAnzeigeMaske' => 'false', 'javax.faces.ViewState' => $viewstate, - 'mainForm:j_idt189' => 'mainForm:j_idt189', + 'mainForm:j_idt184' => 'mainForm:j_idt184' ]; $this->exec_curl($ch, $SCHULPORTAL_ASD_BASE_URL . '/asdup/up_03_02.jsf?cid=' . $conversationId, $post); if(!($this->status)) { diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php index afd65cd..1dbfff8 100644 --- a/src/Controller/AppController.php +++ b/src/Controller/AppController.php @@ -61,7 +61,7 @@ class AppController extends Controller public function beforeRender(Event $event) { if (!array_key_exists('_serialize', $this->viewVars) && - in_array($this->response->type(), ['application/json', 'application/xml']) + in_array($this->response->getType(), ['application/json', 'application/xml']) ) { $this->set('_serialize', true); } diff --git a/src/Controller/CurlsController.php b/src/Controller/CurlsController.php index 896d672..8b2e018 100644 --- a/src/Controller/CurlsController.php +++ b/src/Controller/CurlsController.php @@ -82,8 +82,11 @@ class CurlsController extends AppController //debug($curl->status); $ch = $curl->init_curl_params(); $curl->login_school($ch); + $curl->login_asd($ch); + //echo $curl->html;die; $curl->save_us_data($ch); + //echo $curl->html;die; $this->set('html',$curl->html); $this->redirect(['action' => 'getjsonus']); } @@ -113,10 +116,11 @@ class CurlsController extends AppController $this->set('results',$results); $file = new File('/var/www/html/asd-control/webroot/files/data-us.json', true, 0644); $file->create(); + debug(json_encode($results)); $status = $file->write(json_encode($results), 'w', true); echo $status; $file->close(); - $this->viewBuilder()->layout('getjson'); + $this->viewBuilder()->setLayout('getjson'); } public function getjsonup() { @@ -138,7 +142,7 @@ class CurlsController extends AppController $time = Time::createFromTimestamp($ts); $time->timezone = 'Europe/Paris'; $this->set('time', $time); - $this->viewBuilder()->layout('pivot'); + $this->viewBuilder()->setLayout('pivot'); } public function upStatistik() { diff --git a/src/Controller/OfficesController.php b/src/Controller/OfficesController.php index 9113ab2..1ef37f3 100644 --- a/src/Controller/OfficesController.php +++ b/src/Controller/OfficesController.php @@ -16,9 +16,10 @@ class OfficesController extends AppController $office = $this->Offices->newEntity(); if ($this->request->is(['patch', 'post', 'put'])) { + //debug($this->request['data']);die; $options = [ 'length' => 0, - 'delimiter' => ',', + 'delimiter' => ';', 'enclosure' => '"', 'escape' => '\\', 'headers' => false, @@ -39,12 +40,13 @@ class OfficesController extends AppController $j++; } //debug($data); + //debug($data['d_dst_schluessel']); $office = $this->Offices->find('all',['conditions' => array('dst_schluessel' => $data['d_dst_schluessel'])])->first(); $office['d_regierung'] = $data['d_regierung']; $office['d_mb'] = $data['d_mb']; $office['d_schulamt'] = $data['d_schulamt']; - //debug($office); + //debug($office);die; if (!($this->Offices->save($office))) { debug($office);die; @@ -55,6 +57,8 @@ class OfficesController extends AppController } } + $this->set(compact('office')); + $this->set('_serialize', ['office']); } @@ -104,8 +108,8 @@ class OfficesController extends AppController //debug($entities);die; //$result = $this->Offices->saveMany($entities); } - //$this->set(compact('office')); - //$this->set('_serialize', ['office']); + $this->set(compact('office')); + $this->set('_serialize', ['office']); } /** diff --git a/src/Controller/UsfailsController.php b/src/Controller/UsfailsController.php new file mode 100644 index 0000000..8b188f3 --- /dev/null +++ b/src/Controller/UsfailsController.php @@ -0,0 +1,224 @@ +open($local_file); + + if ($zip_status === true) { + if ($zip->setPassword($zip_pass)) { + if (!$zip->extractTo('/test/results/')) + echo "Extraction failed (wrong password?)"; + } + //debug($zip->statIndex(0)); + $file = $zip->statIndex(0)['name']; + //debug($file); + //debug($file); + $zip->close(); + } + else { + die("Failed opening archive: " . @$zip->getStatusString() . " (code: " . $zip_status . ")"); + } + //echo '/bin/sed -i -E "s/[0-9]{4}[A-Z0-9]{4}[0-9]{17}/XXXXXXXX/g" /test/results/' . $file; + //die; + exec('/bin/sed -i -E "s/[0-9]{4}[A-Z0-9]{4}[0-9]{17}/XXXXXXXX/g" /test/results/' . $file); + rename('/test/results/'.$file,'/var/www/html/asd-control/webroot/files/us/results.csv'); + + ftp_close($conn_id); + return $this->redirect(['controller' => 'Usfails', 'action' => 'import']); + } + + public function import() { + + $sqls = $this->Usfails->schema()->truncateSql($this->Usfails->connection()); + foreach ($sqls as $sql) { + $this->Usfails->connection()->execute($sql)->execute(); + } + $options = [ + 'length' => 0, + 'delimiter' => ';', + 'enclosure' => ' ', + 'escape' => '\\', + 'headers' => false, + 'text' => false, + 'excel_bom' => false, + ]; + + + $filepath = '/var/www/html/asd-control/webroot/files/us/results.csv'; + $handle = fopen($filepath, "r"); + $i = 1; + //$header = fgetcsv($handle, $options['length'], $options['delimiter']); + while ($row = fgetcsv($handle, $options['length'], $options['delimiter'])) { + //debug($row); + $data = (object) []; + $data->snr = trim($row[0]); + $data->name = trim($row[1]); + $data->status = trim($row[2]); + $data->lieferdatum = date('Y-m-d H:i:s', strtotime(str_replace('-', '/', trim($row[3])))); + $data->lieferung = trim($row[4]); + $data->auftrag = trim($row[5]); + $data->plausi = trim($row[6]); + $data->schluessel = trim($row[7]); + $data->sst_objekt = trim($row[8]); + $data->fehler_kurz = trim($row[9]); + $data->fehler_lang = trim($row[10]); + $data->korrekturhinweis = trim($row[11]); + $data->ref_feld = trim($row[12]); + + $line = $this->Usfails->newEntity(); + $line = $this->Usfails->patchEntity($line, (array) $data); + $fault = $result = $this->Usfails->save($line); + //debug($fault); + //die; + //debug($i++); + } + //die; + return $this->redirect(['action' => 'show']); + + } + + public function show() { + $results = $this->Usfails->find('all',array('conditions' => array('plausi != 1'))); + //debug($results); + $this->set('results',$results); + $this->viewBuilder()->setLayout('usfails'); + } + + public function showdetails($snr) { + //debug($snr); + $details = $this->Usfails->find('all',array('conditions' => array('and' => array('snr' => $snr, 'plausi = 1' )))); + $this->set('details',$details); + $this->viewBuilder()->setLayout('usfails'); + } + + + + /** + * Index method + * + * @return \Cake\Http\Response|void + */ + public function index() + { + $usfails = $this->paginate($this->Usfails); + + $this->set(compact('usfails')); + } + + /** + * View method + * + * @param string|null $id Usfail id. + * @return \Cake\Http\Response|void + * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found. + */ + public function view($id = null) + { + $usfail = $this->Usfails->get($id, [ + 'contain' => [] + ]); + + $this->set('usfail', $usfail); + } + + /** + * Add method + * + * @return \Cake\Http\Response|null Redirects on successful add, renders view otherwise. + */ + public function add() + { + $usfail = $this->Usfails->newEntity(); + if ($this->request->is('post')) { + $usfail = $this->Usfails->patchEntity($usfail, $this->request->getData()); + if ($this->Usfails->save($usfail)) { + $this->Flash->success(__('The usfail has been saved.')); + + return $this->redirect(['action' => 'index']); + } + $this->Flash->error(__('The usfail could not be saved. Please, try again.')); + } + $this->set(compact('usfail')); + } + + /** + * Edit method + * + * @param string|null $id Usfail id. + * @return \Cake\Http\Response|null Redirects on successful edit, renders view otherwise. + * @throws \Cake\Network\Exception\NotFoundException When record not found. + */ + public function edit($id = null) + { + $usfail = $this->Usfails->get($id, [ + 'contain' => [] + ]); + if ($this->request->is(['patch', 'post', 'put'])) { + $usfail = $this->Usfails->patchEntity($usfail, $this->request->getData()); + if ($this->Usfails->save($usfail)) { + $this->Flash->success(__('The usfail has been saved.')); + + return $this->redirect(['action' => 'index']); + } + $this->Flash->error(__('The usfail could not be saved. Please, try again.')); + } + $this->set(compact('usfail')); + } + + /** + * Delete method + * + * @param string|null $id Usfail id. + * @return \Cake\Http\Response|null Redirects to index. + * @throws \Cake\Datasource\Exception\RecordNotFoundException When record not found. + */ + public function delete($id = null) + { + $this->request->allowMethod(['post', 'delete']); + $usfail = $this->Usfails->get($id); + if ($this->Usfails->delete($usfail)) { + $this->Flash->success(__('The usfail has been deleted.')); + } else { + $this->Flash->error(__('The usfail could not be deleted. Please, try again.')); + } + + return $this->redirect(['action' => 'index']); + } +} diff --git a/src/Model/Entity/Usfail.php b/src/Model/Entity/Usfail.php new file mode 100644 index 0000000..8b2ee19 --- /dev/null +++ b/src/Model/Entity/Usfail.php @@ -0,0 +1,55 @@ + true, + 'name' => true, + 'status' => true, + 'lieferdatum' => true, + 'lieferung' => true, + 'auftrag' => true, + 'plausi' => true, + 'schluessel' => true, + 'sst_objekt' => true, + 'fehler_kurz' => true, + 'fehler_lang' => true, + 'korrekturhinweis' => true, + 'ref_feld' => true, + 'created' => true, + 'modified' => true + ]; +} diff --git a/src/Model/Table/ResultsTable.php b/src/Model/Table/ResultsTable.php index fe40505..c76d4dd 100644 --- a/src/Model/Table/ResultsTable.php +++ b/src/Model/Table/ResultsTable.php @@ -30,7 +30,7 @@ class ResultsTable extends Table { parent::initialize($config); - $this->table('results'); + $this->setTable('results'); } /** diff --git a/src/Model/Table/UsfailsTable.php b/src/Model/Table/UsfailsTable.php new file mode 100644 index 0000000..88f8c46 --- /dev/null +++ b/src/Model/Table/UsfailsTable.php @@ -0,0 +1,96 @@ +setTable('usfails'); + $this->setDisplayField('name'); + $this->setPrimaryKey('id'); + + $this->addBehavior('Timestamp'); + } + + /** + * Default validation rules. + * + * @param \Cake\Validation\Validator $validator Validator instance. + * @return \Cake\Validation\Validator + */ + public function validationDefault(Validator $validator) + { + $validator + ->integer('id') + ->allowEmpty('id', 'create', 'schluessel', 'sst_objekt', 'fehler_kurz', 'fehler_lang', 'korrekturhinweis', 'ref_feld'); + + $validator + ->scalar('snr') + ->maxLength('snr', 4) + ->requirePresence('snr', 'create') + ->notEmpty('snr'); + + $validator + ->scalar('name') + ->maxLength('name', 50) + ->requirePresence('name', 'create') + ->notEmpty('name'); + + $validator + ->scalar('status') + ->maxLength('status', 50) + ->requirePresence('status', 'create') + ->notEmpty('status'); + + $validator + ->dateTime('lieferdatum') + ->requirePresence('lieferdatum', 'create') + ->notEmpty('lieferdatum'); + + $validator + ->scalar('lieferung') + ->maxLength('lieferung', 20) + ->requirePresence('lieferung', 'create') + ->notEmpty('lieferung'); + + $validator + ->scalar('auftrag') + ->maxLength('auftrag', 20) + ->requirePresence('auftrag', 'create') + ->notEmpty('auftrag'); + + $validator + ->boolean('plausi') + ->requirePresence('plausi', 'create') + ->notEmpty('plausi'); + + return $validator; + } +} diff --git a/src/Template/Apresults/index.ctp b/src/Template/Apresults/index.ctp index fba6c3e..ca80ea7 100644 --- a/src/Template/Apresults/index.ctp +++ b/src/Template/Apresults/index.ctp @@ -1,14 +1,18 @@ - +'; + echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; + $i++; + } ?>
TypSNRAnzahlApcountDatum
NRTypSNRAnzahlApcountDatum
'.$i.''.$apresult['aptype'].''.$apresult['snr'].''.$apresult['anzahl'].''.$apresult['apcount'].''.date('Y-m-d H:i:s',strtotime($apresult['erzeugungsdatum'])).'
\ No newline at end of file diff --git a/src/Template/Curls/getjsonus.ctp b/src/Template/Curls/getjsonus.ctp new file mode 100644 index 0000000..e69de29 diff --git a/src/Template/Curls/us_statistik.ctp b/src/Template/Curls/us_statistik.ctp index 8f26009..07613cb 100644 --- a/src/Template/Curls/us_statistik.ctp +++ b/src/Template/Curls/us_statistik.ctp @@ -1,11 +1,19 @@ US 2017 - Stand: ' . $time->i18nFormat('dd.MM.yyyy HH:mm') . ''; +echo '

US 2018 - Stand: ' . $time->i18nFormat('dd.MM.yyyy HH:mm') . '

'; ?>