From 042e4dee4c3487875f410dcb2150a91d295504f8 Mon Sep 17 00:00:00 2001 From: dp Date: Thu, 26 Mar 2015 12:43:49 +0300 Subject: [PATCH] fix --- {Resource/web => Web}/.htaccess | 0 {Resource/web => Web}/favicon.ico | Bin {Resource/web => Web}/humans.txt | 0 {Resource/web => Web}/index.php | 4 +- {Resource/web => Web}/robots.txt | 0 cli | 4 +- composer.json | 2 +- composer.lock | 702 +++++++++++++++--------------- 8 files changed, 358 insertions(+), 354 deletions(-) rename {Resource/web => Web}/.htaccess (100%) rename {Resource/web => Web}/favicon.ico (100%) rename {Resource/web => Web}/humans.txt (100%) rename {Resource/web => Web}/index.php (59%) rename {Resource/web => Web}/robots.txt (100%) diff --git a/Resource/web/.htaccess b/Web/.htaccess similarity index 100% rename from Resource/web/.htaccess rename to Web/.htaccess diff --git a/Resource/web/favicon.ico b/Web/favicon.ico similarity index 100% rename from Resource/web/favicon.ico rename to Web/favicon.ico diff --git a/Resource/web/humans.txt b/Web/humans.txt similarity index 100% rename from Resource/web/humans.txt rename to Web/humans.txt diff --git a/Resource/web/index.php b/Web/index.php similarity index 59% rename from Resource/web/index.php rename to Web/index.php index 0899a97c..e405f13f 100644 --- a/Resource/web/index.php +++ b/Web/index.php @@ -11,4 +11,6 @@ * @since 0.0 */ -require_once '../app.php'; \ No newline at end of file +define('VENDOR_DIR', dirname(dirname(__DIR__)) . '/_vendor/Ice/'); + +require_once dirname(__DIR__) . '/app.php'; \ No newline at end of file diff --git a/Resource/web/robots.txt b/Web/robots.txt similarity index 100% rename from Resource/web/robots.txt rename to Web/robots.txt diff --git a/cli b/cli index 13dc8a2e..efc098fd 100755 --- a/cli +++ b/cli @@ -10,4 +10,6 @@ * @since 0.0 */ -require_once 'app.php'; \ No newline at end of file +define('VENDOR_DIR', dirname(__DIR__) . '/_vendor/Ice/'); + +require_once __DIR__ . '/app.php'; \ No newline at end of file diff --git a/composer.json b/composer.json index bf264bc5..5558b8d5 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "config": { - "vendor-dir": "../_vendor" + "vendor-dir": "../_vendor/Ice" }, "autoload": { "psr-4": {"Ice\\": "Source/Ice/"}, diff --git a/composer.lock b/composer.lock index ac6bea77..0730a306 100644 --- a/composer.lock +++ b/composer.lock @@ -4,188 +4,8 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "2e9b214e9f0c43ce4b897d8a1b5ba3aa", + "hash": "50a47daeb1d6bd5ff08bd399753482f9", "packages": [ - { - "name": "composer/composer", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/composer/composer.git", - "reference": "ab3622dff1db71024f327387408250208c139a0d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/ab3622dff1db71024f327387408250208c139a0d", - "reference": "ab3622dff1db71024f327387408250208c139a0d", - "shasum": "" - }, - "require": { - "justinrainbow/json-schema": "~1.3", - "php": ">=5.3.2", - "seld/jsonlint": "~1.0", - "symfony/console": "~2.5", - "symfony/finder": "~2.2", - "symfony/process": "~2.1" - }, - "require-dev": { - "phpunit/phpunit": "~4.5" - }, - "suggest": { - "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", - "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic" - }, - "bin": [ - "bin/composer" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-0": { - "Composer": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nils Adermann", - "email": "naderman@naderman.de", - "homepage": "http://www.naderman.de" - }, - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" - } - ], - "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.", - "homepage": "http://getcomposer.org/", - "keywords": [ - "autoload", - "dependency", - "package" - ], - "time": "2015-03-23 11:56:30" - }, - { - "name": "justinrainbow/json-schema", - "version": "1.3.7", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "87b54b460febed69726c781ab67462084e97a105" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/87b54b460febed69726c781ab67462084e97a105", - "reference": "87b54b460febed69726c781ab67462084e97a105", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "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-0": { - "JsonSchema": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" - }, - { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - }, - { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ], - "time": "2014-08-25 02:48:14" - }, - { - "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": "smarty/smarty", "version": "v3.1.21", @@ -242,222 +62,132 @@ "time": "2014-10-31 04:22:20" }, { - "name": "symfony/console", - "version": "v2.6.5", - "target-dir": "Symfony/Component/Console", + "name": "twig/twig", + "version": "v1.18.0", "source": { "type": "git", - "url": "https://github.com/symfony/Console.git", - "reference": "53f86497ccd01677e22435cfb7262599450a90d1" + "url": "https://github.com/twigphp/Twig.git", + "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/53f86497ccd01677e22435cfb7262599450a90d1", - "reference": "53f86497ccd01677e22435cfb7262599450a90d1", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", + "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", "shasum": "" }, "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/event-dispatcher": "~2.1", - "symfony/phpunit-bridge": "~2.7", - "symfony/process": "~2.1" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/process": "" + "php": ">=5.2.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "1.18-dev" } }, "autoload": { "psr-0": { - "Symfony\\Component\\Console\\": "" + "Twig_": "lib/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony Console Component", - "homepage": "http://symfony.com", - "time": "2015-03-13 17:37:22" - }, - { - "name": "symfony/finder", - "version": "v2.6.5", - "target-dir": "Symfony/Component/Finder", - "source": { - "type": "git", - "url": "https://github.com/symfony/Finder.git", - "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/Finder/zipball/bebc7479c566fa4f14b9bcef9e32e719eabec74e", - "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e", - "shasum": "" - }, - "require": { - "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\\Finder\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" }, { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Twig Team", + "homepage": "http://twig.sensiolabs.org/contributors", + "role": "Contributors" } ], - "description": "Symfony Finder Component", - "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" - }, + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ], + "time": "2015-01-25 17:32:08" + } + ], + "packages-dev": [ { - "name": "symfony/process", - "version": "v2.6.5", - "target-dir": "Symfony/Component/Process", + "name": "composer/composer", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/symfony/Process.git", - "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc" + "url": "https://github.com/composer/composer.git", + "reference": "8cfd48c479f4f8f059afb8f7e9f4af21362907fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Process/zipball/4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", - "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", + "url": "https://api.github.com/repos/composer/composer/zipball/8cfd48c479f4f8f059afb8f7e9f4af21362907fd", + "reference": "8cfd48c479f4f8f059afb8f7e9f4af21362907fd", "shasum": "" }, "require": { - "php": ">=5.3.3" + "justinrainbow/json-schema": "~1.4", + "php": ">=5.3.2", + "seld/jsonlint": "~1.0", + "symfony/console": "~2.5", + "symfony/finder": "~2.2", + "symfony/process": "~2.1" }, "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.6-dev" - } + "phpunit/phpunit": "~4.5" }, - "autoload": { - "psr-0": { - "Symfony\\Component\\Process\\": "" - } + "suggest": { + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic" }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } + "bin": [ + "bin/composer" ], - "description": "Symfony Process Component", - "homepage": "http://symfony.com", - "time": "2015-03-12 10:28:44" - }, - { - "name": "twig/twig", - "version": "v1.18.0", - "source": { - "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", - "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.18-dev" + "dev-master": "1.0-dev" } }, "autoload": { "psr-0": { - "Twig_": "lib/" + "Composer": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" }, { - "name": "Twig Team", - "homepage": "http://twig.sensiolabs.org/contributors", - "role": "Contributors" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" } ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", + "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.", + "homepage": "http://getcomposer.org/", "keywords": [ - "templating" + "autoload", + "dependency", + "package" ], - "time": "2015-01-25 17:32:08" - } - ], - "packages-dev": [ + "time": "2015-03-25 14:32:49" + }, { "name": "doctrine/instantiator", "version": "1.0.4", @@ -564,28 +294,94 @@ }, "type": "library", "autoload": { - "classmap": [ - "lib/FirePHPCore/FirePHP.class.php", - "lib/FirePHPCore/fb.php" - ], - "files": [ - "lib/FirePHPCore/fb.php" - ] + "classmap": [ + "lib/FirePHPCore/FirePHP.class.php", + "lib/FirePHPCore/fb.php" + ], + "files": [ + "lib/FirePHPCore/fb.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christoph Dorn", + "email": "christoph@christophdorn.com", + "homepage": "http://christophdorn.com" + } + ], + "description": "Traditional FirePHPCore library for sending PHP variables to the browser.", + "homepage": "https://github.com/firephp/firephp-core", + "time": "2014-11-26 18:59:18" + }, + { + "name": "justinrainbow/json-schema", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/justinrainbow/json-schema.git", + "reference": "680d026082c3aa234b2d8617c50e9c73999913ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/680d026082c3aa234b2d8617c50e9c73999913ba", + "reference": "680d026082c3aa234b2d8617c50e9c73999913ba", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "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-0": { + "JsonSchema": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Christoph Dorn", - "email": "christoph@christophdorn.com", - "homepage": "http://christophdorn.com" + "name": "Bruno Prieto Reis", + "email": "bruno.p.reis@gmail.com" + }, + { + "name": "Justin Rainbow", + "email": "justin.rainbow@gmail.com" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Robert Schönthal", + "email": "seroscho@googlemail.com" } ], - "description": "Traditional FirePHPCore library for sending PHP variables to the browser.", - "homepage": "https://github.com/firephp/firephp-core", - "time": "2014-11-26 18:59:18" + "description": "A library to validate a json schema.", + "homepage": "https://github.com/justinrainbow/json-schema", + "keywords": [ + "json", + "schema" + ], + "time": "2015-03-23 20:38:38" }, { "name": "ocramius/instantiator", @@ -1650,6 +1446,210 @@ "homepage": "https://github.com/sebastianbergmann/version", "time": "2014-12-15 14:25:24" }, + { + "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/console", + "version": "v2.6.5", + "target-dir": "Symfony/Component/Console", + "source": { + "type": "git", + "url": "https://github.com/symfony/Console.git", + "reference": "53f86497ccd01677e22435cfb7262599450a90d1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Console/zipball/53f86497ccd01677e22435cfb7262599450a90d1", + "reference": "53f86497ccd01677e22435cfb7262599450a90d1", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1", + "symfony/phpunit-bridge": "~2.7", + "symfony/process": "~2.1" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6-dev" + } + }, + "autoload": { + "psr-0": { + "Symfony\\Component\\Console\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Console Component", + "homepage": "http://symfony.com", + "time": "2015-03-13 17:37:22" + }, + { + "name": "symfony/finder", + "version": "v2.6.5", + "target-dir": "Symfony/Component/Finder", + "source": { + "type": "git", + "url": "https://github.com/symfony/Finder.git", + "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Finder/zipball/bebc7479c566fa4f14b9bcef9e32e719eabec74e", + "reference": "bebc7479c566fa4f14b9bcef9e32e719eabec74e", + "shasum": "" + }, + "require": { + "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\\Finder\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Finder Component", + "homepage": "http://symfony.com", + "time": "2015-03-12 10:28:44" + }, + { + "name": "symfony/process", + "version": "v2.6.5", + "target-dir": "Symfony/Component/Process", + "source": { + "type": "git", + "url": "https://github.com/symfony/Process.git", + "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/Process/zipball/4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", + "reference": "4d717f34f3d1d6ab30fbe79f7132960a27f4a0dc", + "shasum": "" + }, + "require": { + "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\\Process\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony Process Component", + "homepage": "http://symfony.com", + "time": "2015-03-12 10:28:44" + }, { "name": "symfony/yaml", "version": "v2.6.5", @@ -1704,14 +1704,14 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "composer/composer": 20, "firephp/firephp-core": 20, - "facebook/xhprof": 20 + "facebook/xhprof": 20, + "composer/composer": 20 }, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.5" + "php": ">=5.4.0" }, "platform-dev": [] }