From 151b2f7d102a5988b63255d27c9ad78202c16355 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 9 Nov 2015 00:33:08 +0100 Subject: Added (partial) website + misc updates for release * recreated the prado website in demos/ * updated some docs to reflect the usage of jquery; removed guide to prototype * updated composer * added task for apigen4 (theme still missing) --- composer.lock | 1319 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 787 insertions(+), 532 deletions(-) (limited to 'composer.lock') diff --git a/composer.lock b/composer.lock index e50f1900..d6f18a17 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,11 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://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" ], - "hash": "16bb0dc37f5f9efa8c30a4538c6d3fba", + "hash": "a1bde09fd86627591ec5df56e38dcbe7", + "content-hash": "d41db787e9edab8a7ca78b4c83e1e0f2", "packages": [], "packages-dev": [ { @@ -56,48 +57,61 @@ }, { "name": "apigen/apigen", - "version": "2.8.0", + "version": "v4.1.1", "source": { "type": "git", - "url": "https://github.com/apigen/ApiGen.git", - "reference": "4987551632c3ad3fb7e89cf6dc3fe601e45578c3" + "url": "https://github.com/ApiGen/ApiGen.git", + "reference": "e9aff53d56d2b74104dee2b88396eb614e9717d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/apigen/ApiGen/zipball/4987551632c3ad3fb7e89cf6dc3fe601e45578c3", - "reference": "4987551632c3ad3fb7e89cf6dc3fe601e45578c3", + "url": "https://api.github.com/repos/ApiGen/ApiGen/zipball/e9aff53d56d2b74104dee2b88396eb614e9717d5", + "reference": "e9aff53d56d2b74104dee2b88396eb614e9717d5", "shasum": "" }, "require": { - "andrewsville/php-token-reflection": ">=1.3.1", - "dg/texy": ">=2.1.0", - "kukulich/fshl": ">=2.1.0", - "nette/nette": ">=2.0.5", - "php": ">=5.3.0" + "andrewsville/php-token-reflection": "~1.4", + "apigen/theme-bootstrap": "~1.1.2", + "apigen/theme-default": "~1.0.1", + "herrera-io/phar-update": "~2.0", + "kdyby/events": "~2.0", + "kukulich/fshl": "~2.1", + "latte/latte": "~2.2", + "michelf/php-markdown": "~1.4", + "nette/application": "~2.2", + "nette/bootstrap": "~2.2", + "nette/di": "~2.2", + "nette/mail": "~2.2", + "nette/neon": "~2.2", + "nette/robot-loader": "~2.2", + "nette/safe-stream": "~2.2", + "php": ">=5.4", + "symfony/console": "~2.6", + "symfony/options-resolver": "~2.6.1", + "symfony/yaml": "~2.6", + "tracy/tracy": "~2.2" }, - "suggest": { - "ext-bz2": "*", - "ext-phar": "*", - "ext-zip": "*", - "ext-zlib": "*" + "require-dev": { + "herrera-io/box": "~1.6", + "mockery/mockery": "~0.9" }, "bin": [ - "apigen.php" + "bin/apigen" ], "type": "library", "extra": { "branch-alias": { - "dev-develop": "3.0.0-dev" + "dev-master": "4.1.0-dev" } }, "autoload": { - "psr-0": { - "ApiGen": "./" + "psr-4": { + "ApiGen\\": "src" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { @@ -111,75 +125,109 @@ { "name": "Jaroslav Hanslík", "homepage": "https://github.com/kukulich" + }, + { + "name": "Tomáš Votruba", + "email": "tomas.vot@gmail.com" + }, + { + "name": "Olivier Laviale", + "homepage": "https://github.com/olvlvl" } ], - "description": "API documentation generator for PHP 5.3+", + "description": "PHP source code API generator", "homepage": "http://apigen.org/", "keywords": [ "api", - "docblock", "documentation", "generator", - "phpDocumentor", "phpdoc" ], - "time": "2012-09-29 17:34:02" + "time": "2015-04-09 13:42:45" }, { - "name": "dg/texy", - "version": "v2.6", + "name": "apigen/theme-bootstrap", + "version": "v1.1.3", "source": { "type": "git", - "url": "https://github.com/dg/texy.git", - "reference": "8213d3646c3ab1a3eca52413a5be26acb29826fc" + "url": "https://github.com/ApiGen/ThemeBootstrap.git", + "reference": "55a35b4a3a9a5fcaa6a8fc43fb304983cab98c6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dg/texy/zipball/8213d3646c3ab1a3eca52413a5be26acb29826fc", - "reference": "8213d3646c3ab1a3eca52413a5be26acb29826fc", + "url": "https://api.github.com/repos/ApiGen/ThemeBootstrap/zipball/55a35b4a3a9a5fcaa6a8fc43fb304983cab98c6c", + "reference": "55a35b4a3a9a5fcaa6a8fc43fb304983cab98c6c", "shasum": "" }, "require": { - "php": ">=5.2.0" + "latte/latte": "~2.2" }, - "replace": { - "dg/texy": "self.version" + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tomáš Votruba", + "email": "tomas.vot@gmail.com" + }, + { + "name": "Olivier Laviale", + "homepage": "https://github.com/olvlvl" + } + ], + "description": "Twitter Bootstrap theme for ApiGen", + "homepage": "http://apigen.org/", + "time": "2015-10-11 14:52:50" + }, + { + "name": "apigen/theme-default", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/ApiGen/ThemeDefault.git", + "reference": "51648cf83645d9ae6c655fe46bcd26a347d45336" }, - "require-dev": { - "nette/tester": "~1.2" + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ApiGen/ThemeDefault/zipball/51648cf83645d9ae6c655fe46bcd26a347d45336", + "reference": "51648cf83645d9ae6c655fe46bcd26a347d45336", + "shasum": "" }, - "type": "library", - "autoload": { - "files": [ - "src/texy.php" - ] + "require": { + "latte/latte": "~2.2" }, + "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "MIT" ], "authors": [ { "name": "David Grudl", "homepage": "http://davidgrudl.com" + }, + { + "name": "Ondřej Nešpor", + "homepage": "https://github.com/andrewsville" + }, + { + "name": "Jaroslav Hanslík", + "homepage": "https://github.com/kukulich" + }, + { + "name": "Tomáš Votruba", + "email": "tomas.vot@gmail.com" + }, + { + "name": "Olivier Laviale", + "homepage": "https://github.com/olvlvl" } ], - "description": "Texy converts plain text in easy to read Texy syntax into structurally valid (X)HTML. It supports adding of images, links, nested lists, tables and has full support for CSS. Texy supports hyphenation of long words (which reflects language rules), clickable emails and URL (emails are obfuscated against spambots), national typographic single and double quotation marks, ellipses, em dashes, dimension sign, nonbreakable spaces (e.g. in phone numbers), acronyms, arrows and many others. Texy code can optionally contain HTML tags.", - "homepage": "http://texy.info", - "keywords": [ - "html", - "markdown", - "markup language", - "plain text", - "text", - "textile", - "texy", - "wiki", - "xhtml" - ], - "time": "2014-06-20 18:38:38" + "description": "Default theme for ApiGen", + "homepage": "http://apigen.org/", + "time": "2015-10-11 14:55:30" }, { "name": "guzzle/guzzle", @@ -277,142 +325,299 @@ "time": "2015-03-18 18:23:50" }, { - "name": "kukulich/fshl", - "version": "2.1.0", + "name": "herrera-io/json", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/kukulich/fshl.git", - "reference": "974c294ade5d76c0c16b6fe3fd3a584ba999b24f" + "url": "https://github.com/kherge-abandoned/php-json.git", + "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kukulich/fshl/zipball/974c294ade5d76c0c16b6fe3fd3a584ba999b24f", - "reference": "974c294ade5d76c0c16b6fe3fd3a584ba999b24f", + "url": "https://api.github.com/repos/kherge-abandoned/php-json/zipball/60c696c9370a1e5136816ca557c17f82a6fa83f1", + "reference": "60c696c9370a1e5136816ca557c17f82a6fa83f1", "shasum": "" }, "require": { - "php": ">=5.3" + "ext-json": "*", + "justinrainbow/json-schema": ">=1.0,<2.0-dev", + "php": ">=5.3.3", + "seld/jsonlint": ">=1.0,<2.0-dev" + }, + "require-dev": { + "herrera-io/phpunit-test-case": "1.*", + "mikey179/vfsstream": "1.1.0", + "phpunit/phpunit": "3.7.*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, "autoload": { + "files": [ + "src/lib/json_version.php" + ], "psr-0": { - "FSHL": "./" + "Herrera\\Json": "src/lib" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "GPL-2.0+" + "MIT" ], "authors": [ { - "name": "Jaroslav Hanslík", - "homepage": "https://github.com/kukulich" + "name": "Kevin Herrera", + "email": "kevin@herrera.io", + "homepage": "http://kevin.herrera.io" } ], - "description": "FSHL is a free, open source, universal, fast syntax highlighter written in PHP.", - "homepage": "http://fshl.kukulich.cz/", + "description": "A library for simplifying JSON linting and validation.", + "homepage": "http://herrera-io.github.com/php-json", "keywords": [ - "highlight", - "library", - "syntax" + "json", + "lint", + "schema", + "validate" ], - "time": "2012-09-08 19:00:07" + "time": "2013-10-30 16:51:34" }, { - "name": "latte/latte", - "version": "v2.3.3", + "name": "herrera-io/phar-update", + "version": "2.0.0", "source": { "type": "git", - "url": "https://github.com/nette/latte.git", - "reference": "025883a04b3a5ca48995246e8d82e6ff323d941e" + "url": "https://github.com/kherge-abandoned/php-phar-update.git", + "reference": "15643c90d3d43620a4f45c910e6afb7a0ad4b488" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/latte/zipball/025883a04b3a5ca48995246e8d82e6ff323d941e", - "reference": "025883a04b3a5ca48995246e8d82e6ff323d941e", + "url": "https://api.github.com/repos/kherge-abandoned/php-phar-update/zipball/15643c90d3d43620a4f45c910e6afb7a0ad4b488", + "reference": "15643c90d3d43620a4f45c910e6afb7a0ad4b488", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=5.3.1" + "herrera-io/json": "1.*", + "herrera-io/version": "1.*", + "php": ">=5.3.3" }, "require-dev": { - "nette/tester": "~1.3" + "herrera-io/phpunit-test-case": "1.*", + "mikey179/vfsstream": "1.1.0", + "phpunit/phpunit": "3.7.*" }, - "suggest": { - "ext-fileinfo": "to use filter |datastream", - "ext-mbstring": "to use filters like lower, upper, capitalize, ..." + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "files": [ + "src/lib/constants.php" + ], + "psr-0": { + "Herrera\\Phar\\Update": "src/lib" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kevin Herrera", + "email": "kevin@herrera.io", + "homepage": "http://kevin.herrera.io" + } + ], + "description": "A library for self-updating Phars.", + "homepage": "http://herrera-io.github.com/php-phar-update", + "keywords": [ + "phar", + "update" + ], + "time": "2013-11-09 17:13:13" + }, + { + "name": "herrera-io/version", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/kherge-abandoned/php-version.git", + "reference": "d39d9642b92a04d8b8a28b871b797a35a2545e85" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kherge-abandoned/php-version/zipball/d39d9642b92a04d8b8a28b871b797a35a2545e85", + "reference": "d39d9642b92a04d8b8a28b871b797a35a2545e85", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "herrera-io/phpunit-test-case": "1.*", + "phpunit/phpunit": "3.7.*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "Herrera\\Version": "src/lib" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "MIT" ], "authors": [ { - "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "name": "Kevin Herrera", + "email": "kevin@herrera.io", + "homepage": "http://kevin.herrera.io" + } + ], + "description": "A library for creating, editing, and comparing semantic versioning numbers.", + "homepage": "http://github.com/herrera-io/php-version", + "keywords": [ + "semantic", + "version" + ], + "time": "2014-05-27 05:29:25" + }, + { + "name": "justinrainbow/json-schema", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/a4bee9f4b344b66e0a0d96c7afae1e92edf385fe", + "reference": "a4bee9f4b344b66e0a0d96c7afae1e92edf385fe", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "require-dev": { + "json-schema/json-schema-test-suite": "1.1.0", + "phpdocumentor/phpdocumentor": "~2", + "phpunit/phpunit": "~3.7" + }, + "bin": [ + "bin/validate-json" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-4": { + "JsonSchema\\": "src/JsonSchema/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" }, { - "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" } ], - "description": "Latte: the amazing template engine for PHP", - "homepage": "http://latte.nette.org", + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", "keywords": [ - "templating", - "twig" + "json", + "schema" ], - "time": "2015-07-03 13:37:59" + "time": "2015-09-08 22:28:04" }, { - "name": "nette/application", - "version": "v2.3.4", + "name": "kdyby/events", + "version": "v2.4.0", "source": { "type": "git", - "url": "https://github.com/nette/application.git", - "reference": "785801e441ef83fa4d75cc47c292afedee9b3e4e" + "url": "https://github.com/Kdyby/Events.git", + "reference": "8049e0fc7abb48178b4a2a9af230eceebe1a83bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/application/zipball/785801e441ef83fa4d75cc47c292afedee9b3e4e", - "reference": "785801e441ef83fa4d75cc47c292afedee9b3e4e", + "url": "https://api.github.com/repos/Kdyby/Events/zipball/8049e0fc7abb48178b4a2a9af230eceebe1a83bc", + "reference": "8049e0fc7abb48178b4a2a9af230eceebe1a83bc", "shasum": "" }, "require": { - "nette/component-model": "~2.2", - "nette/http": "~2.2", - "nette/reflection": "~2.2", - "nette/security": "~2.2", - "nette/utils": "~2.2", - "php": ">=5.3.1" - }, - "conflict": { - "nette/nette": "<2.2" + "nette/di": "~2.3@dev", + "nette/utils": "~2.3@dev" }, "require-dev": { - "latte/latte": "~2.3.0", - "nette/di": "~2.3", - "nette/forms": "~2.2", - "nette/robot-loader": "~2.2", - "nette/tester": "~1.3" - }, - "suggest": { - "latte/latte": "Allows using Latte in templates", - "nette/forms": "Allows to use Nette\\Application\\UI\\Form" + "jakub-onderka/php-parallel-lint": "~0.7", + "latte/latte": "~2.3@dev", + "nette/application": "~2.3@dev", + "nette/bootstrap": "~2.3@dev", + "nette/caching": "~2.3@dev", + "nette/component-model": "~2.2@dev", + "nette/database": "~2.3@dev", + "nette/deprecated": "~2.3@dev", + "nette/di": "~2.3@dev", + "nette/finder": "~2.3@dev", + "nette/forms": "~2.3@dev", + "nette/http": "~2.3@dev", + "nette/mail": "~2.3@dev", + "nette/neon": "~2.3@dev", + "nette/nette": "~2.3@dev", + "nette/php-generator": "~2.3@dev", + "nette/reflection": "~2.3@dev", + "nette/robot-loader": "~2.3@dev", + "nette/safe-stream": "~2.3@dev", + "nette/security": "~2.3@dev", + "nette/tester": "~1.4@rc", + "nette/tokenizer": "~2.2@dev", + "nette/utils": "~2.3@dev", + "symfony/event-dispatcher": "~2.5", + "tracy/tracy": "~2.3@dev" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, "autoload": { + "psr-0": { + "Kdyby\\Events\\": "src/" + }, "classmap": [ - "src/" + "src/Kdyby/Events/exceptions.php" + ], + "files": [ + "src/Doctrine/compatibility.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -423,57 +628,85 @@ ], "authors": [ { - "name": "David Grudl", - "homepage": "http://davidgrudl.com" - }, + "name": "Filip Procházka", + "email": "filip@prochazka.su", + "homepage": "http://filip-prochazka.com" + } + ], + "description": "Events for Nette Framework", + "homepage": "http://kdyby.org", + "keywords": [ + "kdyby", + "nette" + ], + "time": "2015-04-04 16:29:31" + }, + { + "name": "kukulich/fshl", + "version": "2.1.0", + "source": { + "type": "git", + "url": "https://github.com/kukulich/fshl.git", + "reference": "974c294ade5d76c0c16b6fe3fd3a584ba999b24f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kukulich/fshl/zipball/974c294ade5d76c0c16b6fe3fd3a584ba999b24f", + "reference": "974c294ade5d76c0c16b6fe3fd3a584ba999b24f", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "autoload": { + "psr-0": { + "FSHL": "./" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "GPL-2.0+" + ], + "authors": [ { - "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "name": "Jaroslav Hanslík", + "homepage": "https://github.com/kukulich" } ], - "description": "Nette Application MVC Component", - "homepage": "http://nette.org", - "time": "2015-07-01 15:54:47" + "description": "FSHL is a free, open source, universal, fast syntax highlighter written in PHP.", + "homepage": "http://fshl.kukulich.cz/", + "keywords": [ + "highlight", + "library", + "syntax" + ], + "time": "2012-09-08 19:00:07" }, { - "name": "nette/bootstrap", - "version": "v2.3.3", + "name": "latte/latte", + "version": "v2.3.7", "source": { "type": "git", - "url": "https://github.com/nette/bootstrap.git", - "reference": "8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e" + "url": "https://github.com/nette/latte.git", + "reference": "b6e090e461c9cd88d60ae79a7713990b17b1531c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/bootstrap/zipball/8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e", - "reference": "8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e", + "url": "https://api.github.com/repos/nette/latte/zipball/b6e090e461c9cd88d60ae79a7713990b17b1531c", + "reference": "b6e090e461c9cd88d60ae79a7713990b17b1531c", "shasum": "" }, "require": { - "nette/di": "~2.3", - "nette/utils": "~2.2", + "ext-tokenizer": "*", "php": ">=5.3.1" }, - "conflict": { - "nette/nette": "<2.2" - }, "require-dev": { - "latte/latte": "~2.2", - "nette/application": "~2.3", - "nette/caching": "~2.3", - "nette/database": "~2.3", - "nette/forms": "~2.3", - "nette/http": "~2.3", - "nette/mail": "~2.3", - "nette/robot-loader": "~2.2", - "nette/safe-stream": "~2.2", - "nette/security": "~2.3", - "nette/tester": "~1.3", - "tracy/tracy": "~2.3" + "nette/tester": "~1.3" }, "suggest": { - "nette/robot-loader": "to use Configurator::createRobotLoader()", - "tracy/tracy": "to use Configurator::enableDebugger()" + "ext-fileinfo": "to use filter |datastream", + "ext-mbstring": "to use filters like lower, upper, capitalize, ..." }, "type": "library", "autoload": { @@ -490,90 +723,91 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], - "description": "Nette Bootstrap", - "homepage": "http://nette.org", - "time": "2015-07-11 21:07:11" + "description": "Latte: the amazing template engine for PHP", + "homepage": "https://latte.nette.org", + "keywords": [ + "templating", + "twig" + ], + "time": "2015-11-07 22:54:05" }, { - "name": "nette/caching", - "version": "v2.3.3", + "name": "michelf/php-markdown", + "version": "1.5.0", "source": { "type": "git", - "url": "https://github.com/nette/caching.git", - "reference": "d4be13806d70c02d53b72cc63e93de6cf813f50f" + "url": "https://github.com/michelf/php-markdown.git", + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/caching/zipball/d4be13806d70c02d53b72cc63e93de6cf813f50f", - "reference": "d4be13806d70c02d53b72cc63e93de6cf813f50f", + "url": "https://api.github.com/repos/michelf/php-markdown/zipball/e1aabe18173231ebcefc90e615565742fc1c7fd9", + "reference": "e1aabe18173231ebcefc90e615565742fc1c7fd9", "shasum": "" }, "require": { - "nette/finder": "~2.2", - "nette/utils": "~2.2", - "php": ">=5.3.1" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "require-dev": { - "latte/latte": "~2.3.0", - "nette/di": "~2.3", - "nette/tester": "~1.4" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-lib": "1.4.x-dev" } }, "autoload": { - "classmap": [ - "src/" - ] + "psr-0": { + "Michelf": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" + "BSD-3-Clause" ], "authors": [ { - "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "name": "John Gruber", + "homepage": "http://daringfireball.net/" }, { - "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "name": "Michel Fortin", + "email": "michel.fortin@michelf.ca", + "homepage": "https://michelf.ca/", + "role": "Developer" } ], - "description": "Nette Caching Component", - "homepage": "http://nette.org", - "time": "2015-07-11 21:09:42" + "description": "PHP Markdown", + "homepage": "https://michelf.ca/projects/php-markdown/", + "keywords": [ + "markdown" + ], + "time": "2015-03-01 12:03:08" }, { - "name": "nette/component-model", - "version": "v2.2.3", + "name": "nette/application", + "version": "v2.3.7", "source": { "type": "git", - "url": "https://github.com/nette/component-model.git", - "reference": "fe13e630a307ef4585b3573eae0a161dc1c3d428" + "url": "https://github.com/nette/application.git", + "reference": "8e87ae81c2098abd7895bfd96d9fac1cd332abc3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/component-model/zipball/fe13e630a307ef4585b3573eae0a161dc1c3d428", - "reference": "fe13e630a307ef4585b3573eae0a161dc1c3d428", + "url": "https://api.github.com/repos/nette/application/zipball/8e87ae81c2098abd7895bfd96d9fac1cd332abc3", + "reference": "8e87ae81c2098abd7895bfd96d9fac1cd332abc3", "shasum": "" }, "require": { + "nette/component-model": "~2.2", + "nette/http": "~2.2", + "nette/reflection": "~2.2", + "nette/security": "~2.2", "nette/utils": "~2.2", "php": ">=5.3.1" }, @@ -581,8 +815,16 @@ "nette/nette": "<2.2" }, "require-dev": { + "latte/latte": "~2.3.0", + "nette/di": "~2.3", + "nette/forms": "~2.2", + "nette/robot-loader": "~2.2", "nette/tester": "~1.3" }, + "suggest": { + "latte/latte": "Allows using Latte in templates", + "nette/forms": "Allows to use Nette\\Application\\UI\\Form" + }, "type": "library", "autoload": { "classmap": [ @@ -598,34 +840,33 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], - "description": "Nette Component Model", - "homepage": "http://nette.org", - "time": "2015-07-11 21:11:20" + "description": "Nette Application MVC Component", + "homepage": "https://nette.org", + "time": "2015-10-13 14:33:28" }, { - "name": "nette/database", - "version": "v2.3.4", + "name": "nette/bootstrap", + "version": "v2.3.3", "source": { "type": "git", - "url": "https://github.com/nette/database.git", - "reference": "e5163fa150071af0f55518c414e177bc2b4be09d" + "url": "https://github.com/nette/bootstrap.git", + "reference": "8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/database/zipball/e5163fa150071af0f55518c414e177bc2b4be09d", - "reference": "e5163fa150071af0f55518c414e177bc2b4be09d", + "url": "https://api.github.com/repos/nette/bootstrap/zipball/8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e", + "reference": "8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e", "shasum": "" }, "require": { - "ext-pdo": "*", - "nette/caching": "~2.2", + "nette/di": "~2.3", "nette/utils": "~2.2", "php": ">=5.3.1" }, @@ -633,9 +874,22 @@ "nette/nette": "<2.2" }, "require-dev": { - "mockery/mockery": "~0.9.1", - "nette/di": "~2.3", - "nette/tester": "~1.3" + "latte/latte": "~2.2", + "nette/application": "~2.3", + "nette/caching": "~2.3", + "nette/database": "~2.3", + "nette/forms": "~2.3", + "nette/http": "~2.3", + "nette/mail": "~2.3", + "nette/robot-loader": "~2.2", + "nette/safe-stream": "~2.2", + "nette/security": "~2.3", + "nette/tester": "~1.3", + "tracy/tracy": "~2.3" + }, + "suggest": { + "nette/robot-loader": "to use Configurator::createRobotLoader()", + "tracy/tracy": "to use Configurator::enableDebugger()" }, "type": "library", "autoload": { @@ -659,44 +913,46 @@ "homepage": "http://nette.org/contributors" } ], - "description": "Nette Database Component", + "description": "Nette Bootstrap", "homepage": "http://nette.org", - "time": "2015-07-20 01:20:17" + "time": "2015-07-11 21:07:11" }, { - "name": "nette/deprecated", - "version": "v2.3.1", + "name": "nette/caching", + "version": "v2.4.2", "source": { "type": "git", - "url": "https://github.com/nette/deprecated.git", - "reference": "169acddcc088bf74eb5b3c14d17f19b26d486b52" + "url": "https://github.com/nette/caching.git", + "reference": "ce04a24e03230a3ad163540aab46635c220163ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/deprecated/zipball/169acddcc088bf74eb5b3c14d17f19b26d486b52", - "reference": "169acddcc088bf74eb5b3c14d17f19b26d486b52", + "url": "https://api.github.com/repos/nette/caching/zipball/ce04a24e03230a3ad163540aab46635c220163ed", + "reference": "ce04a24e03230a3ad163540aab46635c220163ed", "shasum": "" }, - "require-dev": { - "latte/latte": "~2.2", - "nette/application": "~2.2", - "nette/bootstrap": "~2.2, >=2.2.1", - "nette/caching": "~2.2", - "nette/forms": "~2.2", - "nette/mail": "~2.2", - "nette/robot-loader": "~2.2", - "nette/safe-stream": "~2.2", - "nette/tester": "~1.1", + "require": { + "nette/finder": "~2.2", "nette/utils": "~2.2", - "tracy/tracy": "~2.2" + "php": ">=5.4.4" + }, + "conflict": { + "nette/nette": "<2.2" + }, + "require-dev": { + "latte/latte": "~2.4", + "nette/di": "~2.3", + "nette/tester": "~1.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, "autoload": { "classmap": [ "src/" - ], - "files": [ - "src/loader.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -715,28 +971,26 @@ "homepage": "http://nette.org/contributors" } ], - "description": "APIs and features removed from Nette Framework", + "description": "Nette Caching Component", "homepage": "http://nette.org", - "time": "2015-07-11 20:57:29" + "time": "2015-09-07 11:57:44" }, { - "name": "nette/di", - "version": "v2.3.5", + "name": "nette/component-model", + "version": "v2.2.4", "source": { "type": "git", - "url": "https://github.com/nette/di.git", - "reference": "c3e726f8bef49033ba78efe19e999e5fac63f433" + "url": "https://github.com/nette/component-model.git", + "reference": "07bce436051fd92d084642ce7a47f00045e0d1e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/c3e726f8bef49033ba78efe19e999e5fac63f433", - "reference": "c3e726f8bef49033ba78efe19e999e5fac63f433", + "url": "https://api.github.com/repos/nette/component-model/zipball/07bce436051fd92d084642ce7a47f00045e0d1e5", + "reference": "07bce436051fd92d084642ce7a47f00045e0d1e5", "shasum": "" }, "require": { - "nette/neon": "~2.3", - "nette/php-generator": "~2.3", - "nette/utils": "~2.3", + "nette/utils": "^2.3.5", "php": ">=5.3.1" }, "conflict": { @@ -760,40 +1014,42 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], - "description": "Nette Dependency Injection Component", - "homepage": "http://nette.org", - "time": "2015-07-13 22:28:49" + "description": "Nette Component Model", + "homepage": "https://nette.org", + "time": "2015-10-06 17:54:05" }, { - "name": "nette/finder", - "version": "v2.3.1", + "name": "nette/di", + "version": "v2.3.6", "source": { "type": "git", - "url": "https://github.com/nette/finder.git", - "reference": "38f803a03f4cddf352e28af70294c71f7026e516" + "url": "https://github.com/nette/di.git", + "reference": "efa1d13f016b58b4a9200802c9c5b14d10d72e85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/finder/zipball/38f803a03f4cddf352e28af70294c71f7026e516", - "reference": "38f803a03f4cddf352e28af70294c71f7026e516", + "url": "https://api.github.com/repos/nette/di/zipball/efa1d13f016b58b4a9200802c9c5b14d10d72e85", + "reference": "efa1d13f016b58b4a9200802c9c5b14d10d72e85", "shasum": "" }, "require": { - "nette/utils": "~2.2", + "nette/neon": "^2.3.3", + "nette/php-generator": "^2.3.3", + "nette/utils": "~2.3", "php": ">=5.3.1" }, "conflict": { "nette/nette": "<2.2" }, "require-dev": { - "nette/tester": "~1.4" + "nette/tester": "~1.3" }, "type": "library", "autoload": { @@ -817,27 +1073,25 @@ "homepage": "http://nette.org/contributors" } ], - "description": "Nette Finder: Files Searching", + "description": "Nette Dependency Injection Component", "homepage": "http://nette.org", - "time": "2015-07-11 21:13:50" + "time": "2015-09-14 18:18:24" }, { - "name": "nette/forms", - "version": "v2.3.4", + "name": "nette/finder", + "version": "v2.3.1", "source": { "type": "git", - "url": "https://github.com/nette/forms.git", - "reference": "e4e3777c7a783f1877eda4a07ff2f128bdd05bf9" + "url": "https://github.com/nette/finder.git", + "reference": "38f803a03f4cddf352e28af70294c71f7026e516" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/forms/zipball/e4e3777c7a783f1877eda4a07ff2f128bdd05bf9", - "reference": "e4e3777c7a783f1877eda4a07ff2f128bdd05bf9", + "url": "https://api.github.com/repos/nette/finder/zipball/38f803a03f4cddf352e28af70294c71f7026e516", + "reference": "38f803a03f4cddf352e28af70294c71f7026e516", "shasum": "" }, "require": { - "nette/component-model": "~2.2", - "nette/http": "~2.2", "nette/utils": "~2.2", "php": ">=5.3.1" }, @@ -845,10 +1099,7 @@ "nette/nette": "<2.2" }, "require-dev": { - "latte/latte": "~2.3.2", - "nette/di": "~2.3", - "nette/tester": "~1.3", - "tracy/tracy": "~2.2" + "nette/tester": "~1.4" }, "type": "library", "autoload": { @@ -872,9 +1123,9 @@ "homepage": "http://nette.org/contributors" } ], - "description": "Nette Forms: greatly facilitates web forms", + "description": "Nette Finder: Files Searching", "homepage": "http://nette.org", - "time": "2015-07-20 01:25:35" + "time": "2015-07-11 21:13:50" }, { "name": "nette/http", @@ -932,16 +1183,16 @@ }, { "name": "nette/mail", - "version": "v2.3.2", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/nette/mail.git", - "reference": "2c6c64787edf8131ec5e1b514ecc4a80a6477f80" + "reference": "4ea303d96c6a80ffe357baf59d387f4fe2cfd412" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/mail/zipball/2c6c64787edf8131ec5e1b514ecc4a80a6477f80", - "reference": "2c6c64787edf8131ec5e1b514ecc4a80a6477f80", + "url": "https://api.github.com/repos/nette/mail/zipball/4ea303d96c6a80ffe357baf59d387f4fe2cfd412", + "reference": "4ea303d96c6a80ffe357baf59d387f4fe2cfd412", "shasum": "" }, "require": { @@ -974,29 +1225,29 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], "description": "Nette Mail: Sending E-mails", - "homepage": "http://nette.org", - "time": "2015-07-03 13:31:38" + "homepage": "https://nette.org", + "time": "2015-10-05 12:58:01" }, { "name": "nette/neon", - "version": "v2.3.2", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/nette/neon.git", - "reference": "48b25e0962d70e9125797e67a144f3e057243d9d" + "reference": "12bbb0e85ba8521dd291f4df0fe20a1b79aae32c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/neon/zipball/48b25e0962d70e9125797e67a144f3e057243d9d", - "reference": "48b25e0962d70e9125797e67a144f3e057243d9d", + "url": "https://api.github.com/repos/nette/neon/zipball/12bbb0e85ba8521dd291f4df0fe20a1b79aae32c", + "reference": "12bbb0e85ba8521dd291f4df0fe20a1b79aae32c", "shasum": "" }, "require": { @@ -1030,92 +1281,20 @@ ], "description": "Nette NEON: parser & generator for Nette Object Notation", "homepage": "http://ne-on.org", - "time": "2015-07-13 22:29:08" - }, - { - "name": "nette/nette", - "version": "v2.3.4", - "source": { - "type": "git", - "url": "https://github.com/nette/nette.git", - "reference": "7748ab2d7b1a6cd3dda10538758e981c71e5b72d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/nette/zipball/7748ab2d7b1a6cd3dda10538758e981c71e5b72d", - "reference": "7748ab2d7b1a6cd3dda10538758e981c71e5b72d", - "shasum": "" - }, - "require": { - "latte/latte": "2.3.3", - "nette/application": "2.3.4", - "nette/bootstrap": "2.3.3", - "nette/caching": "2.3.3", - "nette/component-model": "2.2.3", - "nette/database": "2.3.4", - "nette/deprecated": "2.3.1", - "nette/di": "2.3.5", - "nette/finder": "2.3.1", - "nette/forms": "2.3.4", - "nette/http": "2.3.3", - "nette/mail": "2.3.2", - "nette/neon": "2.3.2", - "nette/php-generator": "2.3.1", - "nette/reflection": "2.3.1", - "nette/robot-loader": "2.3.1", - "nette/safe-stream": "2.3.1", - "nette/security": "2.3.1", - "nette/tokenizer": "2.2.1", - "nette/utils": "2.3.3", - "tracy/tracy": "2.3.3" - }, - "type": "library", - "autoload": { - "classmap": [ - "Nette/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "http://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "http://nette.org/contributors" - } - ], - "description": "Nette Framework - innovative framework for fast and easy development of secured web applications in PHP. Write less, have cleaner code and your work will bring you joy.", - "homepage": "http://nette.org", - "keywords": [ - "Forms", - "database", - "debugging", - "framework", - "mailing", - "mvc", - "templating" - ], - "time": "2015-07-20 01:58:21" + "time": "2015-08-22 15:23:30" }, { "name": "nette/php-generator", - "version": "v2.3.1", + "version": "v2.3.4", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "c47ad59b972e8a5f4bb00299951bd8053a8fc074" + "reference": "846028e9d885d2d8ec60823d995e1291bbe3eb69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/c47ad59b972e8a5f4bb00299951bd8053a8fc074", - "reference": "c47ad59b972e8a5f4bb00299951bd8053a8fc074", + "url": "https://api.github.com/repos/nette/php-generator/zipball/846028e9d885d2d8ec60823d995e1291bbe3eb69", + "reference": "846028e9d885d2d8ec60823d995e1291bbe3eb69", "shasum": "" }, "require": { @@ -1143,16 +1322,16 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], "description": "Nette PHP Generator", - "homepage": "http://nette.org", - "time": "2015-07-11 21:19:33" + "homepage": "https://nette.org", + "time": "2015-10-09 14:34:13" }, { "name": "nette/reflection", @@ -1365,67 +1544,18 @@ "homepage": "http://nette.org", "time": "2015-07-11 21:22:53" }, - { - "name": "nette/tokenizer", - "version": "v2.2.1", - "source": { - "type": "git", - "url": "https://github.com/nette/tokenizer.git", - "reference": "cbb4920d166af495f83eb213f16512a421d44f63" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nette/tokenizer/zipball/cbb4920d166af495f83eb213f16512a421d44f63", - "reference": "cbb4920d166af495f83eb213f16512a421d44f63", - "shasum": "" - }, - "require": { - "php": ">=5.3.1" - }, - "conflict": { - "nette/nette": "<2.2" - }, - "require-dev": { - "nette/tester": "~1.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause", - "GPL-2.0", - "GPL-3.0" - ], - "authors": [ - { - "name": "David Grudl", - "homepage": "http://davidgrudl.com" - }, - { - "name": "Nette Community", - "homepage": "http://nette.org/contributors" - } - ], - "description": "Nette Tokenizer", - "homepage": "http://nette.org", - "time": "2015-07-11 21:24:02" - }, { "name": "nette/utils", - "version": "v2.3.3", + "version": "v2.3.6", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "ff80fce39fdc381e7e0db6cc5ffc82162e59f6bb" + "reference": "c9dfaec788eb65d5ef10cefed0ae63bc76febaa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/ff80fce39fdc381e7e0db6cc5ffc82162e59f6bb", - "reference": "ff80fce39fdc381e7e0db6cc5ffc82162e59f6bb", + "url": "https://api.github.com/repos/nette/utils/zipball/c9dfaec788eb65d5ef10cefed0ae63bc76febaa8", + "reference": "c9dfaec788eb65d5ef10cefed0ae63bc76febaa8", "shasum": "" }, "require": { @@ -1458,38 +1588,77 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], "description": "Nette Utility Classes", - "homepage": "http://nette.org", - "time": "2015-07-13 22:30:00" + "homepage": "https://nette.org", + "time": "2015-10-05 12:18:24" }, { "name": "phing/phing", - "version": "2.4.14", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/phingofficial/phing.git", - "reference": "41075d93ca254f1c90c79ec7ce81be2b2629e138" + "reference": "63a495a1f619b60404687a0a059039c5046677df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phingofficial/phing/zipball/41075d93ca254f1c90c79ec7ce81be2b2629e138", - "reference": "41075d93ca254f1c90c79ec7ce81be2b2629e138", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/63a495a1f619b60404687a0a059039c5046677df", + "reference": "63a495a1f619b60404687a0a059039c5046677df", "shasum": "" }, "require": { "php": ">=5.2.0" }, + "require-dev": { + "ext-pdo_sqlite": "*", + "lastcraft/simpletest": "@dev", + "pdepend/pdepend": "2.x", + "pear-pear.php.net/console_getopt": "~1.3.0", + "pear-pear.php.net/http_request2": "2.2.x", + "pear-pear.php.net/net_growl": "2.7.x", + "pear-pear.php.net/pear_packagefilemanager": "1.7.x", + "pear-pear.php.net/pear_packagefilemanager2": "1.0.x", + "pear-pear.php.net/xml_serializer": "0.20.x", + "pear/pear_exception": "~1.0", + "pear/versioncontrol_git": "@dev", + "pear/versioncontrol_svn": "~0.5", + "phpdocumentor/phpdocumentor": "2.x", + "phploc/phploc": "~2.0.6", + "phpmd/phpmd": "~2.2", + "phpunit/phpunit": ">=3.7", + "sebastian/git": "~1.0", + "sebastian/phpcpd": "2.x", + "squizlabs/php_codesniffer": "~2.2" + }, + "suggest": { + "pdepend/pdepend": "PHP version of JDepend", + "pear/archive_tar": "Tar file management class", + "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository", + "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system", + "phpdocumentor/phpdocumentor": "Documentation Generator for PHP", + "phploc/phploc": "A tool for quickly measuring the size of a PHP project", + "phpmd/phpmd": "PHP version of PMD tool", + "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information", + "phpunit/phpunit": "The PHP Unit Testing Framework", + "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code", + "tedivm/jshrink": "Javascript Minifier built in PHP" + }, "bin": [ "bin/phing" ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.11.x-dev" + } + }, "autoload": { "classmap": [ "classes/phing/" @@ -1500,48 +1669,48 @@ "classes" ], "license": [ - "LGPL3" + "LGPL-3.0" ], "authors": [ { "name": "Michiel Rook", - "email": "mrook@php.net", - "role": "Lead" + "email": "mrook@php.net" }, { "name": "Phing Community", - "homepage": "http://www.phing.info/trac/wiki/Development/Contributors" + "homepage": "https://www.phing.info/trac/wiki/Development/Contributors" } ], "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", - "homepage": "http://www.phing.info/", + "homepage": "https://www.phing.info/", "keywords": [ "build", + "phing", "task", "tool" ], - "time": "2012-11-29 21:23:47" + "time": "2015-08-24 21:02:12" }, { "name": "phpunit/dbunit", - "version": "1.3.0", + "version": "1.3.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/dbunit.git", - "reference": "9d8a28bdb41fbd3c0dc16fa32fc00862d06abace" + "reference": "1507040c2541bdffd7fbd71fc792cecdea6a7c61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/9d8a28bdb41fbd3c0dc16fa32fc00862d06abace", - "reference": "9d8a28bdb41fbd3c0dc16fa32fc00862d06abace", + "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/1507040c2541bdffd7fbd71fc792cecdea6a7c61", + "reference": "1507040c2541bdffd7fbd71fc792cecdea6a7c61", "shasum": "" }, "require": { "ext-pdo": "*", "ext-simplexml": "*", "php": ">=5.3.3", - "phpunit/phpunit": ">=3.7.0@stable", - "symfony/yaml": ">=2.1.0" + "phpunit/phpunit": "~3.7|~4.0", + "symfony/yaml": "~2.1" }, "bin": [ "composer/bin/dbunit" @@ -1579,7 +1748,7 @@ "testing", "xunit" ], - "time": "2013-11-04 08:33:33" + "time": "2015-03-29 14:23:04" }, { "name": "phpunit/php-code-coverage", @@ -1691,40 +1860,40 @@ }, { "name": "phpunit/php-invoker", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "8696484458cb43eed025ab46260846de5b74655c" + "reference": "86074bf0fc2caf02ec8819a93f65a37cd0b44c8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/8696484458cb43eed025ab46260846de5b74655c", - "reference": "8696484458cb43eed025ab46260846de5b74655c", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/86074bf0fc2caf02ec8819a93f65a37cd0b44c8e", + "reference": "86074bf0fc2caf02ec8819a93f65a37cd0b44c8e", "shasum": "" }, "require": { "ext-pcntl": "*", - "php": ">=5.2.7", - "phpunit/php-timer": ">=1.0.4,<1.1.0" + "php": ">=5.3.3", + "phpunit/php-timer": ">=1.0.6" + }, + "require-dev": { + "phpunit/phpunit": "~4" }, "type": "library", "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1733,7 +1902,7 @@ "keywords": [ "process" ], - "time": "2013-07-16 05:20:21" + "time": "2015-06-21 13:32:55" }, { "name": "phpunit/php-text-template", @@ -1869,39 +2038,38 @@ }, { "name": "phpunit/phpunit", - "version": "3.7.28", + "version": "3.7.38", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3b97c8492bcafbabe6b6fbd2ab35f2f04d932a8d" + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3b97c8492bcafbabe6b6fbd2ab35f2f04d932a8d", - "reference": "3b97c8492bcafbabe6b6fbd2ab35f2f04d932a8d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6", + "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6", "shasum": "" }, "require": { + "ext-ctype": "*", "ext-dom": "*", + "ext-json": "*", "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "phpunit/php-code-coverage": "~1.2.1", - "phpunit/php-file-iterator": ">=1.3.1", - "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": ">=1.0.4", - "phpunit/phpunit-mock-objects": "~1.2.0", + "phpunit/php-code-coverage": "~1.2", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.1", + "phpunit/php-timer": "~1.0", + "phpunit/phpunit-mock-objects": "~1.2", "symfony/yaml": "~2.0" }, "require-dev": { - "pear-pear/pear": "1.9.4" + "pear-pear.php.net/pear": "1.9.4" }, "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", - "phpunit/php-invoker": ">=1.1.0,<1.2.0" + "phpunit/php-invoker": "~1.1" }, "bin": [ "composer/bin/phpunit" @@ -1939,7 +2107,7 @@ "testing", "xunit" ], - "time": "2013-10-17 07:27:40" + "time": "2014-10-17 09:04:17" }, { "name": "phpunit/phpunit-mock-objects", @@ -2441,27 +2609,70 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "time": "2015-06-21 08:04:50" }, + { + "name": "seld/jsonlint", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/jsonlint.git", + "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4", + "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "bin": [ + "bin/jsonlint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Seld\\JsonLint\\": "src/Seld/JsonLint/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "JSON Linter", + "keywords": [ + "json", + "linter", + "parser", + "validator" + ], + "time": "2015-01-04 21:18:15" + }, { "name": "symfony/config", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Config.git", - "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9" + "url": "https://github.com/symfony/config.git", + "reference": "831f88908b51b9ce945f5e6f402931d1ac544423" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Config/zipball/6c905bbed1e728226de656e4c07d620dfe9e80d9", - "reference": "6c905bbed1e728226de656e4c07d620dfe9e80d9", + "url": "https://api.github.com/repos/symfony/config/zipball/831f88908b51b9ce945f5e6f402931d1ac544423", + "reference": "831f88908b51b9ce945f5e6f402931d1ac544423", "shasum": "" }, "require": { "php": ">=5.3.9", "symfony/filesystem": "~2.3" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { @@ -2489,20 +2700,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-07-09 16:07:40" + "time": "2015-10-11 09:39:48" }, { "name": "symfony/console", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Console.git", - "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e" + "url": "https://github.com/symfony/console.git", + "reference": "5efd632294c8320ea52492db22292ff853a43766" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/d6cf02fe73634c96677e428f840704bfbcaec29e", - "reference": "d6cf02fe73634c96677e428f840704bfbcaec29e", + "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766", + "reference": "5efd632294c8320ea52492db22292ff853a43766", "shasum": "" }, "require": { @@ -2511,7 +2722,6 @@ "require-dev": { "psr/log": "~1.0", "symfony/event-dispatcher": "~2.1", - "symfony/phpunit-bridge": "~2.7", "symfony/process": "~2.1" }, "suggest": { @@ -2546,20 +2756,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-07-28 15:18:12" + "time": "2015-10-20 14:38:46" }, { "name": "symfony/event-dispatcher", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/9310b5f9a87ec2ea75d20fec0b0017c77c66dac3", - "reference": "9310b5f9a87ec2ea75d20fec0b0017c77c66dac3", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8", + "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8", "shasum": "" }, "require": { @@ -2570,7 +2780,6 @@ "symfony/config": "~2.0,>=2.0.5", "symfony/dependency-injection": "~2.6", "symfony/expression-language": "~2.6", - "symfony/phpunit-bridge": "~2.7", "symfony/stopwatch": "~2.3" }, "suggest": { @@ -2604,28 +2813,25 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-06-18 19:21:56" + "time": "2015-10-11 09:39:48" }, { "name": "symfony/filesystem", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Filesystem.git", - "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8" + "url": "https://github.com/symfony/filesystem.git", + "reference": "56fd6df73be859323ff97418d97edc1d756df6df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/2d7b2ddaf3f548f4292df49a99d19c853d43f0b8", - "reference": "2d7b2ddaf3f548f4292df49a99d19c853d43f0b8", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/56fd6df73be859323ff97418d97edc1d756df6df", + "reference": "56fd6df73be859323ff97418d97edc1d756df6df", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { @@ -2653,29 +2859,81 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-07-09 16:07:40" + "time": "2015-10-18 20:23:18" }, { - "name": "symfony/stopwatch", - "version": "v2.7.3", + "name": "symfony/options-resolver", + "version": "v2.6.11", + "target-dir": "Symfony/Component/OptionsResolver", "source": { "type": "git", - "url": "https://github.com/symfony/Stopwatch.git", - "reference": "b07a866719bbac5294c67773340f97b871733310" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "31e56594cee489e9a235b852228b0598b52101c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/b07a866719bbac5294c67773340f97b871733310", - "reference": "b07a866719bbac5294c67773340f97b871733310", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/31e56594cee489e9a235b852228b0598b52101c1", + "reference": "31e56594cee489e9a235b852228b0598b52101c1", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.3" }, "require-dev": { "symfony/phpunit-bridge": "~2.7" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\OptionsResolver\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony OptionsResolver Component", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "time": "2015-05-13 11:33:56" + }, + { + "name": "symfony/stopwatch", + "version": "v2.7.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", + "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", + "shasum": "" + }, + "require": { + "php": ">=5.3.9" + }, + "type": "library", "extra": { "branch-alias": { "dev-master": "2.7-dev" @@ -2702,28 +2960,25 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2015-07-01 18:23:16" + "time": "2015-10-12 12:42:24" }, { "name": "symfony/yaml", - "version": "v2.7.3", + "version": "v2.7.6", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff" + "url": "https://github.com/symfony/yaml.git", + "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/71340e996171474a53f3d29111d046be4ad8a0ff", - "reference": "71340e996171474a53f3d29111d046be4ad8a0ff", + "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", + "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { @@ -2751,20 +3006,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-07-28 14:07:07" + "time": "2015-10-11 09:39:48" }, { "name": "tracy/tracy", - "version": "v2.3.3", + "version": "v2.3.6", "source": { "type": "git", "url": "https://github.com/nette/tracy.git", - "reference": "17d15b8dc83cab3bc5022a45d32c681a76cc19e1" + "reference": "79831c75b6f48fcb897d25ccae5deec358cb2142" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tracy/zipball/17d15b8dc83cab3bc5022a45d32c681a76cc19e1", - "reference": "17d15b8dc83cab3bc5022a45d32c681a76cc19e1", + "url": "https://api.github.com/repos/nette/tracy/zipball/79831c75b6f48fcb897d25ccae5deec358cb2142", + "reference": "79831c75b6f48fcb897d25ccae5deec358cb2142", "shasum": "" }, "require": { @@ -2792,21 +3047,21 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], "description": "Tracy: useful PHP debugger", - "homepage": "http://tracy.nette.org", + "homepage": "https://tracy.nette.org", "keywords": [ "debug", "debugger", "nette" ], - "time": "2015-07-03 12:52:35" + "time": "2015-10-28 23:49:21" } ], "aliases": [], -- cgit v1.2.3 From e99e35819d53dc48ae4e9a8491528a6b6011469f Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 10 Nov 2015 16:45:40 +0100 Subject: Move to phpunit4, drop tests on php5.3 --- .travis.yml | 3 +- build.xml | 15 +- composer.json | 2 +- composer.lock | 455 ++++++++++++++++++++++++++++++++++++++++++++++++---------- 4 files changed, 388 insertions(+), 87 deletions(-) (limited to 'composer.lock') diff --git a/.travis.yml b/.travis.yml index d1e79154..6f23a332 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.3 - 5.4 - 5.5 - 5.6 @@ -12,7 +11,7 @@ before_script: - export PATH=./bin/:$PATH script: - - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.3" ]; then phing test; else phing coverage ; fi;' + - phing coverage after_script: - php ./bin/coveralls -v diff --git a/build.xml b/build.xml index cd8e665f..131cce9d 100644 --- a/build.xml +++ b/build.xml @@ -134,10 +134,11 @@ where <target name> can be one of the following: For all PRADO developers: - - test : run unit tests (results are under /build/test-reports) - - coverage : run unit tests collecting coverage informations - - lint : run lint on framework - - lint-demos : run lint on demos + - test : run unit tests (results are under /build/test-reports) + - coverage : run unit tests collecting coverage informations + - functionaltest : run funcitonal tests (requires Selenium Server) + - lint : run lint on framework + - lint-demos : run lint on demos For PRADO release manager: - dist : create release files; @@ -262,7 +263,7 @@ - + @@ -276,7 +277,7 @@ - + @@ -298,7 +299,7 @@ - + diff --git a/composer.json b/composer.json index cde83ee5..6383603d 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ }, "require-dev" : { "ext-xdebug": "*", - "phpunit/phpunit" : "3.7.*", + "phpunit/phpunit" : "4.*", "phpunit/dbunit": ">=1.2", "phpunit/phpunit-selenium": ">=1.2", "phpunit/php-invoker": "*", diff --git a/composer.lock b/composer.lock index d6f18a17..e8b9f3d1 100644 --- a/composer.lock +++ b/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": "a1bde09fd86627591ec5df56e38dcbe7", - "content-hash": "d41db787e9edab8a7ca78b4c83e1e0f2", + "hash": "0569b5829512f5338c219adcc006b6dc", + "content-hash": "66cdcc9c585d73d14670d6e8b6fd1b0e", "packages": [], "packages-dev": [ { @@ -229,6 +229,60 @@ "homepage": "http://apigen.org/", "time": "2015-10-11 14:55:30" }, + { + "name": "doctrine/instantiator", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14 21:17:01" + }, { "name": "guzzle/guzzle", "version": "v3.9.3", @@ -1691,46 +1745,151 @@ ], "time": "2015-08-24 21:02:12" }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "phpDocumentor": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" + } + ], + "time": "2015-02-03 12:10:50" + }, + { + "name": "phpspec/prophecy", + "version": "v1.5.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "phpdocumentor/reflection-docblock": "~2.0", + "sebastian/comparator": "~1.1" + }, + "require-dev": { + "phpspec/phpspec": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "psr-0": { + "Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2015-08-13 10:07:40" + }, { "name": "phpunit/dbunit", - "version": "1.3.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/dbunit.git", - "reference": "1507040c2541bdffd7fbd71fc792cecdea6a7c61" + "reference": "390cefcb101e07e1d6400dbdfc3b90ecf2c1279f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/1507040c2541bdffd7fbd71fc792cecdea6a7c61", - "reference": "1507040c2541bdffd7fbd71fc792cecdea6a7c61", + "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/390cefcb101e07e1d6400dbdfc3b90ecf2c1279f", + "reference": "390cefcb101e07e1d6400dbdfc3b90ecf2c1279f", "shasum": "" }, "require": { "ext-pdo": "*", "ext-simplexml": "*", - "php": ">=5.3.3", - "phpunit/phpunit": "~3.7|~4.0", - "symfony/yaml": "~2.1" + "php": ">=5.4", + "phpunit/phpunit": "~4|~5", + "symfony/yaml": "~2.1|~3.0" }, "bin": [ - "composer/bin/dbunit" + "dbunit" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "classmap": [ - "PHPUnit/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "", - "../../symfony/yaml/" - ], "license": [ "BSD-3-Clause" ], @@ -1748,50 +1907,51 @@ "testing", "xunit" ], - "time": "2015-03-29 14:23:04" + "time": "2015-11-03 11:17:01" }, { "name": "phpunit/php-code-coverage", - "version": "1.2.18", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b" + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", - "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", "shasum": "" }, "require": { "php": ">=5.3.3", - "phpunit/php-file-iterator": ">=1.3.0@stable", - "phpunit/php-text-template": ">=1.2.0@stable", - "phpunit/php-token-stream": ">=1.1.3,<1.3.0" + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0" }, "require-dev": { - "phpunit/phpunit": "3.7.*@dev" + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4" }, "suggest": { "ext-dom": "*", - "ext-xdebug": ">=2.0.5" + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1809,7 +1969,7 @@ "testing", "xunit" ], - "time": "2014-09-02 10:13:14" + "time": "2015-10-06 15:47:00" }, { "name": "phpunit/php-file-iterator", @@ -1988,45 +2148,44 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.2.2", + "version": "1.4.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", - "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", "shasum": "" }, "require": { "ext-tokenizer": "*", "php": ">=5.3.3" }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "email": "sebastian@phpunit.de" } ], "description": "Wrapper around PHP's tokenizer extension.", @@ -2034,62 +2193,61 @@ "keywords": [ "tokenizer" ], - "time": "2014-03-03 05:10:30" + "time": "2015-09-15 10:49:45" }, { "name": "phpunit/phpunit", - "version": "3.7.38", + "version": "4.8.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6" + "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6", - "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/625f8c345606ed0f3a141dfb88f4116f0e22978e", + "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e", "shasum": "" }, "require": { - "ext-ctype": "*", "ext-dom": "*", "ext-json": "*", "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "phpunit/php-code-coverage": "~1.2", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.1", - "phpunit/php-timer": "~1.0", - "phpunit/phpunit-mock-objects": "~1.2", - "symfony/yaml": "~2.0" - }, - "require-dev": { - "pear-pear.php.net/pear": "1.9.4" + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~2.1", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": ">=1.0.6", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.1", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.1|~3.0" }, "suggest": { "phpunit/php-invoker": "~1.1" }, "bin": [ - "composer/bin/phpunit" + "phpunit" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.7.x-dev" + "dev-master": "4.8.x-dev" } }, "autoload": { "classmap": [ - "PHPUnit/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "", - "../../symfony/yaml/" - ], "license": [ "BSD-3-Clause" ], @@ -2101,45 +2259,52 @@ } ], "description": "The PHP Unit Testing framework.", - "homepage": "http://www.phpunit.de/", + "homepage": "https://phpunit.de/", "keywords": [ "phpunit", "testing", "xunit" ], - "time": "2014-10-17 09:04:17" + "time": "2015-10-23 06:48:33" }, { "name": "phpunit/phpunit-mock-objects", - "version": "1.2.3", + "version": "2.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875" + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875", - "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.0.2", "php": ">=5.3.3", - "phpunit/php-text-template": ">=1.1.1@stable" + "phpunit/php-text-template": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" }, "suggest": { "ext-soap": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, "autoload": { "classmap": [ - "PHPUnit/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -2156,7 +2321,7 @@ "mock", "xunit" ], - "time": "2013-01-13 10:24:48" + "time": "2015-10-02 06:51:40" }, { "name": "phpunit/phpunit-selenium", @@ -2490,6 +2655,56 @@ ], "time": "2015-02-22 15:13:53" }, + { + "name": "sebastian/environment", + "version": "1.3.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44", + "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2015-08-03 06:14:51" + }, { "name": "sebastian/exporter", "version": "1.2.1", @@ -2556,6 +2771,57 @@ ], "time": "2015-06-21 07:55:53" }, + { + "name": "sebastian/global-state", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2015-10-12 03:26:01" + }, { "name": "sebastian/recursion-context", "version": "1.0.1", @@ -2609,6 +2875,41 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "time": "2015-06-21 08:04:50" }, + { + "name": "sebastian/version", + "version": "1.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2015-06-21 13:59:46" + }, { "name": "seld/jsonlint", "version": "1.3.1", -- cgit v1.2.3 From f6a3eb2bf3a165fd76ed43177150d09731918449 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Mon, 7 Dec 2015 17:40:27 +0100 Subject: Misc repo fixes --- .buildpath | 5 - .gitignore | 4 +- composer.json | 2 +- composer.lock | 450 ++++++++++++--------- demos/blog/protected/Common/schema.sql | 4 +- demos/blog/protected/Layouts/MainLayout.tpl | 2 +- demos/composer/themes/PradoSoft/style.css | 2 +- index.html | 9 +- .../issues/protected/pages/Issue516.page | 0 .../issues/protected/pages/Issue516.php | 0 .../issues/tests/Issue516TestCase.php | 0 11 files changed, 275 insertions(+), 203 deletions(-) delete mode 100644 .buildpath mode change 100644 => 100755 tests/FunctionalTests/issues/protected/pages/Issue516.page mode change 100644 => 100755 tests/FunctionalTests/issues/protected/pages/Issue516.php mode change 100644 => 100755 tests/FunctionalTests/issues/tests/Issue516TestCase.php (limited to 'composer.lock') diff --git a/.buildpath b/.buildpath deleted file mode 100644 index b48394ff..00000000 --- a/.buildpath +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.gitignore b/.gitignore index 9fc6c85f..5975736a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/.buildpath /.idea atlassian-ide-plugin.xml /.project @@ -20,7 +21,8 @@ buildscripts/texbuilder/quickstart/quickstart.toc demos/quickstart/.cache demos/quickstart/.project demos/quickstart/.settings -demos/quickstart/index_pl.php +demos/blog/protected/Data/Blog.db +demos/chat/protected/App_Code/chat.db tests/FunctionalTests/results.dat tests/unit/Data/db/test.db diff --git a/composer.json b/composer.json index 833e6552..470c1ac0 100644 --- a/composer.json +++ b/composer.json @@ -70,7 +70,7 @@ "support" : { "issues" : "https://github.com/pradosoft/prado/issues", "source" : "https://github.com/pradosoft/prado", - "docs" : "http://www.pradoframework.net/site/documentation", + "docs" : "http://www.pradoframework.net/site/documentation" }, "bin" : [ "bin/prado-cli" diff --git a/composer.lock b/composer.lock index e8b9f3d1..d270ba66 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "0569b5829512f5338c219adcc006b6dc", + "hash": "7eec12baae95e3302f17626d3ef393f8", "content-hash": "66cdcc9c585d73d14670d6e8b6fd1b0e", "packages": [], "packages-dev": [ @@ -57,16 +57,16 @@ }, { "name": "apigen/apigen", - "version": "v4.1.1", + "version": "v4.1.2", "source": { "type": "git", "url": "https://github.com/ApiGen/ApiGen.git", - "reference": "e9aff53d56d2b74104dee2b88396eb614e9717d5" + "reference": "3365433ea3433b0e5c8f763608f8e63cbedb2a3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ApiGen/ApiGen/zipball/e9aff53d56d2b74104dee2b88396eb614e9717d5", - "reference": "e9aff53d56d2b74104dee2b88396eb614e9717d5", + "url": "https://api.github.com/repos/ApiGen/ApiGen/zipball/3365433ea3433b0e5c8f763608f8e63cbedb2a3a", + "reference": "3365433ea3433b0e5c8f763608f8e63cbedb2a3a", "shasum": "" }, "require": { @@ -76,7 +76,7 @@ "herrera-io/phar-update": "~2.0", "kdyby/events": "~2.0", "kukulich/fshl": "~2.1", - "latte/latte": "~2.2", + "latte/latte": ">=2.2.0,<2.3.5", "michelf/php-markdown": "~1.4", "nette/application": "~2.2", "nette/bootstrap": "~2.2", @@ -143,7 +143,7 @@ "generator", "phpdoc" ], - "time": "2015-04-09 13:42:45" + "time": "2015-11-29 20:11:30" }, { "name": "apigen/theme-bootstrap", @@ -739,16 +739,16 @@ }, { "name": "latte/latte", - "version": "v2.3.7", + "version": "v2.3.4", "source": { "type": "git", "url": "https://github.com/nette/latte.git", - "reference": "b6e090e461c9cd88d60ae79a7713990b17b1531c" + "reference": "5e891af999776d2204a9d06ad66ad8fa0bcd4f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/latte/zipball/b6e090e461c9cd88d60ae79a7713990b17b1531c", - "reference": "b6e090e461c9cd88d60ae79a7713990b17b1531c", + "url": "https://api.github.com/repos/nette/latte/zipball/5e891af999776d2204a9d06ad66ad8fa0bcd4f8b", + "reference": "5e891af999776d2204a9d06ad66ad8fa0bcd4f8b", "shasum": "" }, "require": { @@ -777,20 +777,20 @@ "authors": [ { "name": "David Grudl", - "homepage": "https://davidgrudl.com" + "homepage": "http://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "https://nette.org/contributors" + "homepage": "http://nette.org/contributors" } ], "description": "Latte: the amazing template engine for PHP", - "homepage": "https://latte.nette.org", + "homepage": "http://latte.nette.org", "keywords": [ "templating", "twig" ], - "time": "2015-11-07 22:54:05" + "time": "2015-08-23 12:36:55" }, { "name": "michelf/php-markdown", @@ -845,16 +845,16 @@ }, { "name": "nette/application", - "version": "v2.3.7", + "version": "v2.3.8", "source": { "type": "git", "url": "https://github.com/nette/application.git", - "reference": "8e87ae81c2098abd7895bfd96d9fac1cd332abc3" + "reference": "32023ed31791cdf05be8816528ae5921dc841b5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/application/zipball/8e87ae81c2098abd7895bfd96d9fac1cd332abc3", - "reference": "8e87ae81c2098abd7895bfd96d9fac1cd332abc3", + "url": "https://api.github.com/repos/nette/application/zipball/32023ed31791cdf05be8816528ae5921dc841b5a", + "reference": "32023ed31791cdf05be8816528ae5921dc841b5a", "shasum": "" }, "require": { @@ -903,20 +903,20 @@ ], "description": "Nette Application MVC Component", "homepage": "https://nette.org", - "time": "2015-10-13 14:33:28" + "time": "2015-12-03 04:12:02" }, { "name": "nette/bootstrap", - "version": "v2.3.3", + "version": "v2.3.4", "source": { "type": "git", "url": "https://github.com/nette/bootstrap.git", - "reference": "8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e" + "reference": "e32964df66f2c5a3a50b229204f583d20c1f6829" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/bootstrap/zipball/8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e", - "reference": "8e2db45c39a1fa24f88e94c7b2a62ad09e9a306e", + "url": "https://api.github.com/repos/nette/bootstrap/zipball/e32964df66f2c5a3a50b229204f583d20c1f6829", + "reference": "e32964df66f2c5a3a50b229204f583d20c1f6829", "shasum": "" }, "require": { @@ -960,29 +960,29 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], "description": "Nette Bootstrap", - "homepage": "http://nette.org", - "time": "2015-07-11 21:07:11" + "homepage": "https://nette.org", + "time": "2015-11-16 20:18:31" }, { "name": "nette/caching", - "version": "v2.4.2", + "version": "v2.4.3", "source": { "type": "git", "url": "https://github.com/nette/caching.git", - "reference": "ce04a24e03230a3ad163540aab46635c220163ed" + "reference": "f60c1767fe5a4b2b45edf2a98cf9dc70c15ea1b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/caching/zipball/ce04a24e03230a3ad163540aab46635c220163ed", - "reference": "ce04a24e03230a3ad163540aab46635c220163ed", + "url": "https://api.github.com/repos/nette/caching/zipball/f60c1767fe5a4b2b45edf2a98cf9dc70c15ea1b1", + "reference": "f60c1767fe5a4b2b45edf2a98cf9dc70c15ea1b1", "shasum": "" }, "require": { @@ -994,9 +994,9 @@ "nette/nette": "<2.2" }, "require-dev": { - "latte/latte": "~2.4", + "latte/latte": "~2.3.0", "nette/di": "~2.3", - "nette/tester": "~1.4" + "nette/tester": "~1.6" }, "type": "library", "extra": { @@ -1018,16 +1018,16 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], "description": "Nette Caching Component", - "homepage": "http://nette.org", - "time": "2015-09-07 11:57:44" + "homepage": "https://nette.org", + "time": "2015-11-29 21:35:25" }, { "name": "nette/component-model", @@ -1081,29 +1081,29 @@ }, { "name": "nette/di", - "version": "v2.3.6", + "version": "v2.3.7", "source": { "type": "git", "url": "https://github.com/nette/di.git", - "reference": "efa1d13f016b58b4a9200802c9c5b14d10d72e85" + "reference": "7595c0bc17125b6ac3bb8f857b7c9b1be743c762" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/di/zipball/efa1d13f016b58b4a9200802c9c5b14d10d72e85", - "reference": "efa1d13f016b58b4a9200802c9c5b14d10d72e85", + "url": "https://api.github.com/repos/nette/di/zipball/7595c0bc17125b6ac3bb8f857b7c9b1be743c762", + "reference": "7595c0bc17125b6ac3bb8f857b7c9b1be743c762", "shasum": "" }, "require": { "nette/neon": "^2.3.3", "nette/php-generator": "^2.3.3", - "nette/utils": "~2.3", + "nette/utils": "^2.3.5", "php": ">=5.3.1" }, "conflict": { "nette/nette": "<2.2" }, "require-dev": { - "nette/tester": "~1.3" + "nette/tester": "^1.6" }, "type": "library", "autoload": { @@ -1120,16 +1120,16 @@ "authors": [ { "name": "David Grudl", - "homepage": "http://davidgrudl.com" + "homepage": "https://davidgrudl.com" }, { "name": "Nette Community", - "homepage": "http://nette.org/contributors" + "homepage": "https://nette.org/contributors" } ], "description": "Nette Dependency Injection Component", - "homepage": "http://nette.org", - "time": "2015-09-14 18:18:24" + "homepage": "https://nette.org", + "time": "2015-11-13 12:34:13" }, { "name": "nette/finder", @@ -1237,16 +1237,16 @@ }, { "name": "nette/mail", - "version": "v2.3.3", + "version": "v2.3.4", "source": { "type": "git", "url": "https://github.com/nette/mail.git", - "reference": "4ea303d96c6a80ffe357baf59d387f4fe2cfd412" + "reference": "3b8ba96407029d94d83177086bcb5e1fe0046929" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/mail/zipball/4ea303d96c6a80ffe357baf59d387f4fe2cfd412", - "reference": "4ea303d96c6a80ffe357baf59d387f4fe2cfd412", + "url": "https://api.github.com/repos/nette/mail/zipball/3b8ba96407029d94d83177086bcb5e1fe0046929", + "reference": "3b8ba96407029d94d83177086bcb5e1fe0046929", "shasum": "" }, "require": { @@ -1288,7 +1288,7 @@ ], "description": "Nette Mail: Sending E-mails", "homepage": "https://nette.org", - "time": "2015-10-05 12:58:01" + "time": "2015-11-29 22:09:25" }, { "name": "nette/neon", @@ -1339,16 +1339,16 @@ }, { "name": "nette/php-generator", - "version": "v2.3.4", + "version": "v2.3.5", "source": { "type": "git", "url": "https://github.com/nette/php-generator.git", - "reference": "846028e9d885d2d8ec60823d995e1291bbe3eb69" + "reference": "224730a45e0cd6e76e692997a3d981a592f80b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/php-generator/zipball/846028e9d885d2d8ec60823d995e1291bbe3eb69", - "reference": "846028e9d885d2d8ec60823d995e1291bbe3eb69", + "url": "https://api.github.com/repos/nette/php-generator/zipball/224730a45e0cd6e76e692997a3d981a592f80b5d", + "reference": "224730a45e0cd6e76e692997a3d981a592f80b5d", "shasum": "" }, "require": { @@ -1385,7 +1385,7 @@ ], "description": "Nette PHP Generator", "homepage": "https://nette.org", - "time": "2015-10-09 14:34:13" + "time": "2015-11-29 22:14:37" }, { "name": "nette/reflection", @@ -1600,16 +1600,16 @@ }, { "name": "nette/utils", - "version": "v2.3.6", + "version": "v2.3.7", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "c9dfaec788eb65d5ef10cefed0ae63bc76febaa8" + "reference": "6f1ed73088c28a24acc9657ca14b3418a270e24b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/c9dfaec788eb65d5ef10cefed0ae63bc76febaa8", - "reference": "c9dfaec788eb65d5ef10cefed0ae63bc76febaa8", + "url": "https://api.github.com/repos/nette/utils/zipball/6f1ed73088c28a24acc9657ca14b3418a270e24b", + "reference": "6f1ed73088c28a24acc9657ca14b3418a270e24b", "shasum": "" }, "require": { @@ -1651,20 +1651,20 @@ ], "description": "Nette Utility Classes", "homepage": "https://nette.org", - "time": "2015-10-05 12:18:24" + "time": "2015-11-30 00:11:35" }, { "name": "phing/phing", - "version": "2.12.0", + "version": "2.13.0", "source": { "type": "git", "url": "https://github.com/phingofficial/phing.git", - "reference": "63a495a1f619b60404687a0a059039c5046677df" + "reference": "a5b10a50160c8a4744545aacb33ef158349e655c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phingofficial/phing/zipball/63a495a1f619b60404687a0a059039c5046677df", - "reference": "63a495a1f619b60404687a0a059039c5046677df", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/a5b10a50160c8a4744545aacb33ef158349e655c", + "reference": "a5b10a50160c8a4744545aacb33ef158349e655c", "shasum": "" }, "require": { @@ -1674,13 +1674,10 @@ "ext-pdo_sqlite": "*", "lastcraft/simpletest": "@dev", "pdepend/pdepend": "2.x", - "pear-pear.php.net/console_getopt": "~1.3.0", - "pear-pear.php.net/http_request2": "2.2.x", - "pear-pear.php.net/net_growl": "2.7.x", - "pear-pear.php.net/pear_packagefilemanager": "1.7.x", - "pear-pear.php.net/pear_packagefilemanager2": "1.0.x", - "pear-pear.php.net/xml_serializer": "0.20.x", - "pear/pear_exception": "~1.0", + "pear/archive_tar": "1.4.x", + "pear/http_request2": "dev-trunk", + "pear/net_growl": "dev-trunk", + "pear/pear-core-minimal": "1.10.1", "pear/versioncontrol_git": "@dev", "pear/versioncontrol_svn": "~0.5", "phpdocumentor/phpdocumentor": "2.x", @@ -1689,7 +1686,8 @@ "phpunit/phpunit": ">=3.7", "sebastian/git": "~1.0", "sebastian/phpcpd": "2.x", - "squizlabs/php_codesniffer": "~2.2" + "squizlabs/php_codesniffer": "~2.2", + "symfony/yaml": "~2.7" }, "suggest": { "pdepend/pdepend": "PHP version of JDepend", @@ -1710,7 +1708,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.11.x-dev" + "dev-master": "2.13.x-dev" } }, "autoload": { @@ -1743,7 +1741,7 @@ "task", "tool" ], - "time": "2015-08-24 21:02:12" + "time": "2015-12-04 09:45:44" }, { "name": "phpdocumentor/reflection-docblock", @@ -2197,16 +2195,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.8.16", + "version": "4.8.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e" + "reference": "b2caaf8947aba5e002d42126723e9d69795f32b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/625f8c345606ed0f3a141dfb88f4116f0e22978e", - "reference": "625f8c345606ed0f3a141dfb88f4116f0e22978e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b2caaf8947aba5e002d42126723e9d69795f32b4", + "reference": "b2caaf8947aba5e002d42126723e9d69795f32b4", "shasum": "" }, "require": { @@ -2265,7 +2263,7 @@ "testing", "xunit" ], - "time": "2015-10-23 06:48:33" + "time": "2015-11-30 08:18:59" }, { "name": "phpunit/phpunit-mock-objects", @@ -2470,41 +2468,41 @@ "source": { "type": "git", "url": "https://github.com/satooshi/php-coveralls.git", - "reference": "2fbf803803d179ab1082807308a67bbd5a760c70" + "reference": "410d235bde2aa3f93271b39bbc75f82c58b15a11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/2fbf803803d179ab1082807308a67bbd5a760c70", - "reference": "2fbf803803d179ab1082807308a67bbd5a760c70", + "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/410d235bde2aa3f93271b39bbc75f82c58b15a11", + "reference": "410d235bde2aa3f93271b39bbc75f82c58b15a11", "shasum": "" }, "require": { "ext-json": "*", "ext-simplexml": "*", - "guzzle/guzzle": ">=2.7", - "php": ">=5.3", - "psr/log": "1.0.0", - "symfony/config": ">=2.0", - "symfony/console": ">=2.0", - "symfony/stopwatch": ">=2.2", - "symfony/yaml": ">=2.0" + "guzzle/guzzle": "^2.8|^3.0", + "php": ">=5.3.3", + "psr/log": "^1.0", + "symfony/config": "^2.0|^3.0", + "symfony/console": "^2.1|^3.0", + "symfony/stopwatch": "^2.2|^3.0", + "symfony/yaml": "^2.1|^3.0" }, "require-dev": { - "apigen/apigen": "2.8.*@stable", - "pdepend/pdepend": "dev-master as 2.0.0", - "phpmd/phpmd": "dev-master", - "phpunit/php-invoker": ">=1.1.0,<1.2.0", - "phpunit/phpunit": "3.7.*@stable", - "sebastian/finder-facade": "dev-master", - "sebastian/phpcpd": "1.4.*@stable", - "squizlabs/php_codesniffer": "1.4.*@stable", - "theseer/fdomdocument": "dev-master" + "apigen/apigen": "^2.8", + "pdepend/pdepend": "^2.2", + "phpmd/phpmd": "^2.0", + "phpunit/php-invoker": "^1.1", + "phpunit/phpunit": "^4.0", + "sebastian/finder-facade": "^1.1", + "sebastian/phpcpd": "^1.4", + "squizlabs/php_codesniffer": "^1.4", + "theseer/fdomdocument": "^1.6" }, "suggest": { "symfony/http-kernel": "Allows Symfony integration" }, "bin": [ - "composer/bin/coveralls" + "bin/coveralls" ], "type": "library", "extra": { @@ -2513,9 +2511,8 @@ } }, "autoload": { - "psr-0": { - "Satooshi\\Component": "src/", - "Satooshi\\Bundle": "src/" + "psr-4": { + "Satooshi\\": "src/Satooshi/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2537,7 +2534,7 @@ "github", "test" ], - "time": "2014-11-11 15:35:34" + "time": "2015-12-05 22:25:33" }, { "name": "sebastian/comparator", @@ -2605,28 +2602,28 @@ }, { "name": "sebastian/diff", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" + "reference": "2b0112e42c338afa9ad9dfeb94d66f6d84c2f828" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/2b0112e42c338afa9ad9dfeb94d66f6d84c2f828", + "reference": "2b0112e42c338afa9ad9dfeb94d66f6d84c2f828", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2649,24 +2646,24 @@ } ], "description": "Diff implementation", - "homepage": "http://www.github.com/sebastianbergmann/diff", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ "diff" ], - "time": "2015-02-22 15:13:53" + "time": "2015-12-06 07:21:36" }, { "name": "sebastian/environment", - "version": "1.3.2", + "version": "1.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44" + "reference": "6e7133793a8e5a5714a551a8324337374be209df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df", + "reference": "6e7133793a8e5a5714a551a8324337374be209df", "shasum": "" }, "require": { @@ -2703,7 +2700,7 @@ "environment", "hhvm" ], - "time": "2015-08-03 06:14:51" + "time": "2015-12-02 08:37:27" }, { "name": "sebastian/exporter", @@ -2824,16 +2821,16 @@ }, { "name": "sebastian/recursion-context", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba" + "reference": "913401df809e99e4f47b27cdd781f4a258d58791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba", - "reference": "994d4a811bafe801fb06dccbee797863ba2792ba", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791", "shasum": "" }, "require": { @@ -2873,7 +2870,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-06-21 08:04:50" + "time": "2015-11-11 19:50:13" }, { "name": "sebastian/version", @@ -2912,20 +2909,20 @@ }, { "name": "seld/jsonlint", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4" + "reference": "66834d3e3566bb5798db7294619388786ae99394" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/863ae85c6d3ef60ca49cb12bd051c4a0648c40c4", - "reference": "863ae85c6d3ef60ca49cb12bd051c4a0648c40c4", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/66834d3e3566bb5798db7294619388786ae99394", + "reference": "66834d3e3566bb5798db7294619388786ae99394", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^5.3 || ^7.0" }, "bin": [ "bin/jsonlint" @@ -2954,36 +2951,39 @@ "parser", "validator" ], - "time": "2015-01-04 21:18:15" + "time": "2015-11-21 02:21:41" }, { "name": "symfony/config", - "version": "v2.7.6", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "831f88908b51b9ce945f5e6f402931d1ac544423" + "reference": "40bae8658dbbb500ebc19aa9fde22dc4295fc290" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/831f88908b51b9ce945f5e6f402931d1ac544423", - "reference": "831f88908b51b9ce945f5e6f402931d1ac544423", + "url": "https://api.github.com/repos/symfony/config/zipball/40bae8658dbbb500ebc19aa9fde22dc4295fc290", + "reference": "40bae8658dbbb500ebc19aa9fde22dc4295fc290", "shasum": "" }, "require": { - "php": ">=5.3.9", - "symfony/filesystem": "~2.3" + "php": ">=5.5.9", + "symfony/filesystem": "~2.8|~3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Config\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3001,29 +3001,30 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-11-02 20:34:04" }, { "name": "symfony/console", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "5efd632294c8320ea52492db22292ff853a43766" + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766", - "reference": "5efd632294c8320ea52492db22292ff853a43766", + "url": "https://api.github.com/repos/symfony/console/zipball/d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", + "reference": "d232bfc100dfd32b18ccbcab4bcc8f28697b7e41", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/process": "~2.1" + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0" }, "suggest": { "psr/log": "For using the console logger", @@ -3033,13 +3034,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Console\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3057,20 +3061,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-10-20 14:38:46" + "time": "2015-11-30 12:35:10" }, { "name": "symfony/event-dispatcher", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8" + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8", - "reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a5eb815363c0388e83247e7e9853e5dbc14999cc", + "reference": "a5eb815363c0388e83247e7e9853e5dbc14999cc", "shasum": "" }, "require": { @@ -3078,10 +3082,10 @@ }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.0,>=2.0.5", - "symfony/dependency-injection": "~2.6", - "symfony/expression-language": "~2.6", - "symfony/stopwatch": "~2.3" + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" }, "suggest": { "symfony/dependency-injection": "", @@ -3090,13 +3094,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3114,35 +3121,38 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-10-30 20:15:42" }, { "name": "symfony/filesystem", - "version": "v2.7.6", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "56fd6df73be859323ff97418d97edc1d756df6df" + "reference": "692d98d813e4ef314b9c22775c86ddbeb0f44884" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/56fd6df73be859323ff97418d97edc1d756df6df", - "reference": "56fd6df73be859323ff97418d97edc1d756df6df", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/692d98d813e4ef314b9c22775c86ddbeb0f44884", + "reference": "692d98d813e4ef314b9c22775c86ddbeb0f44884", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Filesystem\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3160,11 +3170,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-10-18 20:23:18" + "time": "2015-11-23 10:41:47" }, { "name": "symfony/options-resolver", - "version": "v2.6.11", + "version": "v2.6.12", "target-dir": "Symfony/Component/OptionsResolver", "source": { "type": "git", @@ -3217,33 +3227,92 @@ ], "time": "2015-05-13 11:33:56" }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0b6a8940385311a24e060ec1fe35680e17c74497", + "reference": "0b6a8940385311a24e060ec1fe35680e17c74497", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2015-11-04 20:28:58" + }, { "name": "symfony/stopwatch", - "version": "v2.7.6", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55" + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", - "reference": "f8ab957c17e4b85a73c4df03bdf94ee597f2bd55", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6aeac8907e3e1340a0033b0a9ec075f8e6524800", + "reference": "6aeac8907e3e1340a0033b0a9ec075f8e6524800", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "3.0-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Stopwatch\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3261,20 +3330,20 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2015-10-12 12:42:24" + "time": "2015-10-30 23:35:59" }, { "name": "symfony/yaml", - "version": "v2.7.6", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d" + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d", - "reference": "eca9019c88fbe250164affd107bc8057771f3f4d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/f79824187de95064a2f5038904c4d7f0227fedb5", + "reference": "f79824187de95064a2f5038904c4d7f0227fedb5", "shasum": "" }, "require": { @@ -3283,13 +3352,16 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3307,20 +3379,20 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-10-11 09:39:48" + "time": "2015-11-30 12:35:10" }, { "name": "tracy/tracy", - "version": "v2.3.6", + "version": "v2.3.7", "source": { "type": "git", "url": "https://github.com/nette/tracy.git", - "reference": "79831c75b6f48fcb897d25ccae5deec358cb2142" + "reference": "eddb369f320b86fe37838bbbfb12d79ddd21d134" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/tracy/zipball/79831c75b6f48fcb897d25ccae5deec358cb2142", - "reference": "79831c75b6f48fcb897d25ccae5deec358cb2142", + "url": "https://api.github.com/repos/nette/tracy/zipball/eddb369f320b86fe37838bbbfb12d79ddd21d134", + "reference": "eddb369f320b86fe37838bbbfb12d79ddd21d134", "shasum": "" }, "require": { @@ -3362,7 +3434,7 @@ "debugger", "nette" ], - "time": "2015-10-28 23:49:21" + "time": "2015-11-30 00:50:47" } ], "aliases": [], diff --git a/demos/blog/protected/Common/schema.sql b/demos/blog/protected/Common/schema.sql index ea95b595..e96ca409 100755 --- a/demos/blog/protected/Common/schema.sql +++ b/demos/blog/protected/Common/schema.sql @@ -58,10 +58,10 @@ CREATE TABLE tblPost2Category ( ); INSERT INTO tblUsers (id,name,full_name,role,status,passwd,email,reg_time,website) - VALUES (1,'admin','Prado User',1,0,'4d688da592969d0a56b5accec3ce8554','admin@example.com',1148819681,'https://github.com/pradosoft/prado'); + VALUES (1,'admin','Prado User',1,0,'4d688da592969d0a56b5accec3ce8554','admin@example.com',1438819691,'https://github.com/pradosoft/prado'); INSERT INTO tblPosts (id,author_id,create_time,title,content,status) - VALUES (1,1,1148819691,'Welcome to Prado Weblog','Congratulations! You have successfully installed Prado Blog -- a PRADO-driven weblog system. A default administrator account has been created. Please login with admin/prado and update your password as soon as possible.',0); + VALUES (1,1,1438819691,'Welcome to Prado Weblog','Congratulations! You have successfully installed Prado Blog -- a PRADO-driven weblog system. A default administrator account has been created. Please login with admin/prado and update your password as soon as possible.',0); INSERT INTO tblCategories (name,description,post_count) VALUES ('Miscellaneous','This category holds posts on any topic.',1); diff --git a/demos/blog/protected/Layouts/MainLayout.tpl b/demos/blog/protected/Layouts/MainLayout.tpl index 1f8b037e..c4bfb5f4 100755 --- a/demos/blog/protected/Layouts/MainLayout.tpl +++ b/demos/blog/protected/Layouts/MainLayout.tpl @@ -39,7 +39,7 @@ diff --git a/demos/composer/themes/PradoSoft/style.css b/demos/composer/themes/PradoSoft/style.css index 2ded60ed..b4ac218b 100755 --- a/demos/composer/themes/PradoSoft/style.css +++ b/demos/composer/themes/PradoSoft/style.css @@ -82,7 +82,7 @@ div#footer { clear: both; margin: 0px auto; - width: 170px; + width: 300px; padding: 10px; } diff --git a/index.html b/index.html index a5daa5fb..a6dc9c7c 100644 --- a/index.html +++ b/index.html @@ -86,10 +86,11 @@ A Textmate extension can be found under editors/Textmate.

Prado v3 Developer Team

The following Team Members are currently inactive

@@ -103,6 +104,8 @@ A Textmate extension can be found under editors/Textmate.
  • Eirik Hoem
  • Yves Berkholz
  • Ole Helgesen
    • +
  • Robin J. Rogge
    • +
  • Christophe Boulain

    • Translations

    diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.page b/tests/FunctionalTests/issues/protected/pages/Issue516.page old mode 100644 new mode 100755 diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.php b/tests/FunctionalTests/issues/protected/pages/Issue516.php old mode 100644 new mode 100755 diff --git a/tests/FunctionalTests/issues/tests/Issue516TestCase.php b/tests/FunctionalTests/issues/tests/Issue516TestCase.php old mode 100644 new mode 100755 -- cgit v1.2.3