summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.buildpath5
-rw-r--r--.gitignore4
-rw-r--r--composer.json2
-rw-r--r--composer.lock450
-rwxr-xr-xdemos/blog/protected/Common/schema.sql4
-rwxr-xr-xdemos/blog/protected/Layouts/MainLayout.tpl2
-rwxr-xr-xdemos/composer/themes/PradoSoft/style.css2
-rw-r--r--index.html9
-rwxr-xr-x[-rw-r--r--]tests/FunctionalTests/issues/protected/pages/Issue516.page0
-rwxr-xr-x[-rw-r--r--]tests/FunctionalTests/issues/protected/pages/Issue516.php0
-rwxr-xr-x[-rw-r--r--]tests/FunctionalTests/issues/tests/Issue516TestCase.php0
11 files changed, 275 insertions, 203 deletions
diff --git a/.buildpath b/.buildpath
deleted file mode 100644
index b48394ff..00000000
--- a/.buildpath
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<buildpath>
- <buildpathentry excluding="framework/pradolite.php" kind="src" path=""/>
- <buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
-</buildpath>
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",
@@ -3218,32 +3228,91 @@
"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 <b>admin/prado</b> 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 <b>admin/prado</b> 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 @@
</div><!-- end of sidebar -->
<div id="footer">
-Copyright &copy; 2006 <%$ SiteOwner %>.<br/>
+Copyright &copy; <%= date('Y') %>, <%$ SiteOwner %>.<br/>
<%= Prado::poweredByPrado() %>
</div><!-- end of footer -->
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 <b>editors/Textmate</b>.
<h3>Prado v3 Developer Team</h3>
<ul>
-<li><a href="mailto:Christophe.Boulain@gmail.com">Christophe Boulain</a></li>
-<li><a href="mailto:ctrlaltca@gmail.com">Fabio Bas</a></li>
-<li><a href="mailto:rojaro@gmail.com">Robin J. Rogge</a></li>
<li><a href="mailto:ciromattia@gmail.com">Ciro Mattia Gonano</a></li>
+<li><a href="mailto:darthdaniel85@gmail.com">Daniel Sampedro</a></li>
+<li>David Otto</li>
+<li><a href="mailto:ctrlaltca@gmail.com">Fabio Bas</a></li>
+<li>Jens Klaer</li>
</ul>
<h4>The following Team Members are currently inactive</h4>
@@ -103,6 +104,8 @@ A Textmate extension can be found under <b>editors/Textmate</b>.
<li><a href="mailto:eirikhm@gmail.com">Eirik Hoem</a></li>
<li><a href="mailto:godzilla80@gmx.net">Yves Berkholz</a></li>
<li><a href="mailto:kamikazeole@gmail.com">Ole Helgesen</a></li>
+<li><a href="mailto:rojaro@gmail.com">Robin J. Rogge</a></li>
+<li><a href="mailto:Christophe.Boulain@gmail.com">Christophe Boulain</a></li>
</ul>
<h3>Translations</h3>
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.page b/tests/FunctionalTests/issues/protected/pages/Issue516.page
index c922c6e1..c922c6e1 100644..100755
--- a/tests/FunctionalTests/issues/protected/pages/Issue516.page
+++ b/tests/FunctionalTests/issues/protected/pages/Issue516.page
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.php b/tests/FunctionalTests/issues/protected/pages/Issue516.php
index bd3e7a72..bd3e7a72 100644..100755
--- a/tests/FunctionalTests/issues/protected/pages/Issue516.php
+++ b/tests/FunctionalTests/issues/protected/pages/Issue516.php
diff --git a/tests/FunctionalTests/issues/tests/Issue516TestCase.php b/tests/FunctionalTests/issues/tests/Issue516TestCase.php
index 2b221081..2b221081 100644..100755
--- a/tests/FunctionalTests/issues/tests/Issue516TestCase.php
+++ b/tests/FunctionalTests/issues/tests/Issue516TestCase.php
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-24 06:20:22 +0000