diff --git a/README.md b/README.md index a2e1236..e5b046e 100755 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -# Warning: this is a prerelease, and is not usable yet. - # Prado PHP Framework - Basic appliction project PRADO is a component-based and event-driven programming framework for developing Web applications in PHP 5. diff --git a/composer.json b/composer.json index 6774ce2..9fd6b3a 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "pradosoft/prado": "dev-master" + "pradosoft/prado": "*" }, "config": { "vendor-dir": "protected/vendor" diff --git a/composer.lock b/composer.lock index d24ea2a..f4e3fb3 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" ], - "content-hash": "6e3494537b2c4183dde45040ae46040f", + "content-hash": "8c791743971e91f936efe17ef8ed6f80", "packages": [ { "name": "bower-asset/bootstrap", @@ -27,67 +27,76 @@ }, { "name": "bower-asset/clipboard", - "version": "1.5.16.0", + "version": "v1.7.1", "source": { "type": "git", "url": "https://github.com/zenorocha/clipboard.js.git", - "reference": "402c9ee17bed6f273bcbc7efa81874fd9a50b84c" + "reference": "b6e6b80ab07eab03ce0d277515b3ed540773a330" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zenorocha/clipboard.js/zipball/402c9ee17bed6f273bcbc7efa81874fd9a50b84c", - "reference": "402c9ee17bed6f273bcbc7efa81874fd9a50b84c", + "url": "https://api.github.com/repos/zenorocha/clipboard.js/zipball/b6e6b80ab07eab03ce0d277515b3ed540773a330", + "reference": "b6e6b80ab07eab03ce0d277515b3ed540773a330", "shasum": null }, - "type": "library" + "type": "bower-asset", + "license": [ + "MIT" + ] }, { "name": "bower-asset/highlightjs", - "version": "9.9.0.0", + "version": "9.12.0", "source": { "type": "git", "url": "https://github.com/components/highlightjs.git", - "reference": "630617af9c5754cae35cbf84a55d3b5df9ca6738" + "reference": "3686afa1decd999857ac9e1ae27c24df2e64be3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/components/highlightjs/zipball/630617af9c5754cae35cbf84a55d3b5df9ca6738", - "reference": "630617af9c5754cae35cbf84a55d3b5df9ca6738", + "url": "https://api.github.com/repos/components/highlightjs/zipball/3686afa1decd999857ac9e1ae27c24df2e64be3a", + "reference": "3686afa1decd999857ac9e1ae27c24df2e64be3a", "shasum": null }, - "type": "library" + "type": "bower-asset" }, { "name": "bower-asset/highlightjs-line-numbers.js", - "version": "1.1.0.0", + "version": "v2.1.0", "source": { "type": "git", - "url": "https://github.com/wcoder/highlightjs-line-numbers.js.git", - "reference": "2acd76fda5e72d4eee9031221bd340c7fcf9eb79" + "url": "git@github.com:wcoder/highlightjs-line-numbers.js.git", + "reference": "766f9c0f616d89abad8ab839ddaabf50d45a5aa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wcoder/highlightjs-line-numbers.js/zipball/2acd76fda5e72d4eee9031221bd340c7fcf9eb79", - "reference": "2acd76fda5e72d4eee9031221bd340c7fcf9eb79", + "url": "https://api.github.com/repos/wcoder/highlightjs-line-numbers.js/zipball/766f9c0f616d89abad8ab839ddaabf50d45a5aa3", + "reference": "766f9c0f616d89abad8ab839ddaabf50d45a5aa3", "shasum": null }, - "type": "library" + "type": "bower-asset", + "license": [ + "MIT" + ] }, { "name": "bower-asset/jquery", - "version": "3.1.1.0", + "version": "3.2.1", "source": { "type": "git", "url": "https://github.com/jquery/jquery-dist.git", - "reference": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3" + "reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3", - "reference": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3", + "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/77d2a51d0520d2ee44173afdf4e40a9201f5964e", + "reference": "77d2a51d0520d2ee44173afdf4e40a9201f5964e", "shasum": null }, - "type": "library" + "type": "bower-asset", + "license": [ + "MIT" + ] }, { "name": "bower-asset/jquery-ui", @@ -129,7 +138,7 @@ "version": "1.9.0.0", "source": { "type": "git", - "url": "https://github.com/plynchnlm/scriptaculous-bower.git", + "url": "git@github.com:plynchnlm/scriptaculous-bower.git", "reference": "cd5b0f19ef8c777e9dbf8a1f9389d1a5091ff34d" }, "dist": { @@ -145,19 +154,22 @@ }, { "name": "bower-asset/tinymce", - "version": "4.5.2.0", + "version": "4.7.3", "source": { "type": "git", "url": "https://github.com/tinymce/tinymce-dist.git", - "reference": "7b45b6de0b8835d5b54dafbd4a3c5a0e11abc3d6" + "reference": "a2392f870b4c85bd536e5cc77f640e035ce657af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/7b45b6de0b8835d5b54dafbd4a3c5a0e11abc3d6", - "reference": "7b45b6de0b8835d5b54dafbd4a3c5a0e11abc3d6", + "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/a2392f870b4c85bd536e5cc77f640e035ce657af", + "reference": "a2392f870b4c85bd536e5cc77f640e035ce657af", "shasum": null }, - "type": "library" + "type": "bower-asset", + "license": [ + "LGPL-2.1" + ] }, { "name": "dnoegel/php-xdg-base-dir", @@ -194,21 +206,24 @@ }, { "name": "erusev/parsedown", - "version": "1.6.1", + "version": "1.6.4", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb" + "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/20ff8bbb57205368b4b42d094642a3e52dac85fb", - "reference": "20ff8bbb57205368b4b42d094642a3e52dac85fb", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548", + "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" + }, "type": "library", "autoload": { "psr-0": { @@ -232,25 +247,28 @@ "markdown", "parser" ], - "time": "2016-11-02T15:56:58+00:00" + "time": "2017-11-14T20:44:03+00:00" }, { "name": "ezyang/htmlpurifier", - "version": "v4.8.0", + "version": "v4.9.3", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2" + "reference": "95e1bae3182efc0f3422896a3236e991049dac69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2", - "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/95e1bae3182efc0f3422896a3236e991049dac69", + "reference": "95e1bae3182efc0f3422896a3236e991049dac69", "shasum": "" }, "require": { "php": ">=5.2" }, + "require-dev": { + "simpletest/simpletest": "^1.1" + }, "type": "library", "autoload": { "psr-0": { @@ -276,7 +294,7 @@ "keywords": [ "html" ], - "time": "2016-07-16T12:58:58+00:00" + "time": "2017-06-03T02:28:16+00:00" }, { "name": "firephp/firephp-core", @@ -403,16 +421,16 @@ }, { "name": "nikic/php-parser", - "version": "v3.0.2", + "version": "v3.1.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744" + "reference": "08131e7ff29de6bb9f12275c7d35df71f25f4d89" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/adf44419c0fc014a0f191db6f89d3e55d4211744", - "reference": "adf44419c0fc014a0f191db6f89d3e55d4211744", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/08131e7ff29de6bb9f12275c7d35df71f25f4d89", + "reference": "08131e7ff29de6bb9f12275c7d35df71f25f4d89", "shasum": "" }, "require": { @@ -450,20 +468,20 @@ "parser", "php" ], - "time": "2016-12-06T11:30:35+00:00" + "time": "2017-11-04T11:48:34+00:00" }, { "name": "pradosoft/prado", - "version": "dev-master", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/pradosoft/prado.git", - "reference": "a5784be398e9b6beeeb0510365c15c0df45a3c26" + "reference": "900677bfa155cab9edbf9b71b18cef593af8242f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pradosoft/prado/zipball/a5784be398e9b6beeeb0510365c15c0df45a3c26", - "reference": "a5784be398e9b6beeeb0510365c15c0df45a3c26", + "url": "https://api.github.com/repos/pradosoft/prado/zipball/900677bfa155cab9edbf9b71b18cef593af8242f", + "reference": "900677bfa155cab9edbf9b71b18cef593af8242f", "shasum": "" }, "require": { @@ -471,8 +489,8 @@ "bower-asset/clipboard": "*", "bower-asset/highlightjs": "^9", "bower-asset/highlightjs-line-numbers.js": "*", - "bower-asset/jquery": "^3.1", - "bower-asset/jquery-ui": "^1.12", + "bower-asset/jquery": "^3", + "bower-asset/jquery-ui": "^1", "bower-asset/prototypejs-bower": "^1.7", "bower-asset/scriptaculous-bower": "^1.9", "bower-asset/tinymce": "^4", @@ -493,12 +511,12 @@ "pradosoft/prado": "4.0" }, "require-dev": { - "apigen/apigen": "dev-master", "ext-xdebug": "*", "phpunit/dbunit": "*", "phpunit/php-invoker": "*", "phpunit/phpunit": "5.*", "phpunit/phpunit-selenium": "3.*", + "pradosoft/apigen": "4.2.x-dev", "pradosoft/prado-apigen-theme": "*" }, "suggest": { @@ -561,7 +579,7 @@ "component", "framework" ], - "time": "2017-01-16 08:53:15" + "time": "2017-11-20T20:53:31+00:00" }, { "name": "pradosoft/prado-tinymce3", @@ -692,16 +710,16 @@ }, { "name": "psy/psysh", - "version": "v0.8.1", + "version": "v0.8.15", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "701e8a1cc426ee170f1296f5d9f6b8a26ad25c4a" + "reference": "b1d289c2cb03a2f8249912c53e96ced38f879926" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/701e8a1cc426ee170f1296f5d9f6b8a26ad25c4a", - "reference": "701e8a1cc426ee170f1296f5d9f6b8a26ad25c4a", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b1d289c2cb03a2f8249912c53e96ced38f879926", + "reference": "b1d289c2cb03a2f8249912c53e96ced38f879926", "shasum": "" }, "require": { @@ -715,7 +733,7 @@ "require-dev": { "friendsofphp/php-cs-fixer": "~1.11", "hoa/console": "~3.16|~1.14", - "phpunit/phpunit": "~4.4|~5.0", + "phpunit/phpunit": "^4.8.35|^5.4.3", "symfony/finder": "~2.1|~3.0" }, "suggest": { @@ -731,7 +749,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-develop": "0.9.x-dev" + "dev-develop": "0.8.x-dev" } }, "autoload": { @@ -761,43 +779,49 @@ "interactive", "shell" ], - "time": "2017-01-15T17:54:13+00:00" + "time": "2017-11-16T14:29:51+00:00" }, { "name": "symfony/console", - "version": "v3.2.2", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd" + "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f9e449e76996adf310498a8ca955c6deebe29dd", - "reference": "4f9e449e76996adf310498a8ca955c6deebe29dd", + "url": "https://api.github.com/repos/symfony/console/zipball/2cdef78de8f54f68ff16a857e710e7302b47d4c7", + "reference": "2cdef78de8f54f68ff16a857e710e7302b47d4c7", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/debug": "~2.8|~3.0", + "php": "^5.5.9|>=7.0.8", + "symfony/debug": "~2.8|~3.0|~4.0", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "symfony/dependency-injection": "<3.4", + "symfony/process": "<3.3" + }, "require-dev": { "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/filesystem": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0" + "symfony/config": "~3.3|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/lock": "~3.4|~4.0", + "symfony/process": "~3.3|~4.0" }, "suggest": { "psr/log": "For using the console logger", "symfony/event-dispatcher": "", - "symfony/filesystem": "", + "symfony/lock": "", "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -824,37 +848,36 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2017-01-08T20:47:33+00:00" + "time": "2017-12-02T18:20:11+00:00" }, { "name": "symfony/debug", - "version": "v3.2.2", + "version": "v4.0.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05" + "reference": "26a15dab86c3820473716be4f846eac774ad4ad9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/810ba5c1c5352a4ddb15d4719e8936751dff0b05", - "reference": "810ba5c1c5352a4ddb15d4719e8936751dff0b05", + "url": "https://api.github.com/repos/symfony/debug/zipball/26a15dab86c3820473716be4f846eac774ad4ad9", + "reference": "26a15dab86c3820473716be4f846eac774ad4ad9", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^7.1.3", "psr/log": "~1.0" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/http-kernel": "<3.4" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "~3.4|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -881,20 +904,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2017-01-02T20:32:22+00:00" + "time": "2017-11-21T09:27:49+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.3.0", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4" + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4", - "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", "shasum": "" }, "require": { @@ -906,7 +929,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -940,36 +963,42 @@ "portable", "shim" ], - "time": "2016-11-14T01:06:16+00:00" + "time": "2017-10-11T12:05:26+00:00" }, { "name": "symfony/var-dumper", - "version": "v3.2.2", + "version": "v3.4.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2" + "reference": "ec650a975a8e04e0c114d35eab732981243db3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b54b23f9a19b465e76fdaac0f6732410467c83b2", - "reference": "b54b23f9a19b465e76fdaac0f6732410467c83b2", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ec650a975a8e04e0c114d35eab732981243db3a2", + "reference": "ec650a975a8e04e0c114d35eab732981243db3a2", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "symfony/polyfill-mbstring": "~1.0" }, + "conflict": { + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + }, "require-dev": { - "twig/twig": "~1.20|~2.0" + "ext-iconv": "*", + "twig/twig": "~1.34|~2.4" }, "suggest": { + "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", + "ext-intl": "To show region name in time zone dump", "ext-symfony_debug": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-master": "3.4-dev" } }, "autoload": { @@ -1003,15 +1032,13 @@ "debug", "dump" ], - "time": "2017-01-03T08:53:57+00:00" + "time": "2017-11-30T14:59:23+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "pradosoft/prado": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": [], diff --git a/protected/Layouts/MainLayout.tpl b/protected/Layouts/MainLayout.tpl index cf84eee..46e66db 100644 --- a/protected/Layouts/MainLayout.tpl +++ b/protected/Layouts/MainLayout.tpl @@ -8,8 +8,6 @@ - -