diff --git a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
index a218b027ec4bd43024d89e0aa18aceee8a0b2b42..2e694b772c3c45babdb0f0a6318ae9ae29d992ec 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/page/js/require_js.phtml
@@ -5,11 +5,6 @@
*/
?>
<script>
- var BLANK_URL = '<?php echo $this->getViewFileUrl('blank.html') ?>';
- var BLANK_IMG = '<?php echo $this->getViewFileUrl('spacer.gif') ?>';
- var BASE_URL = '<?php echo $this->getUrl('*') ?>';
- var FORM_KEY = '<?php echo $this->getFormKey() ?>';
- var require = {
- "baseUrl": "<?php echo $this->getViewFileUrl('/') ?>"
- };
+ var BASE_URL = '<?php echo $this->getUrl('*') ?>',
+ FORM_KEY = '<?php echo $this->getFormKey() ?>';
</script>
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index b0f2b06196e0228ba337ba317b88c2e8ddf53338..c6769c7cfe7cf3ede4c0c39487378c4e8eb48649 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -8,8 +8,6 @@
<page layout="3columns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
<update handle="default_head_blocks"/>
<body>
- <!-- Temporary solution -->
- <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::js/require_js.phtml" />
<referenceContainer name="after.body.start">
<block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
<block class="Magento\Translation\Block\Js" name="translate" template="Magento_Translation::translate.phtml"/>
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/require_js.phtml b/app/code/Magento/Theme/view/frontend/templates/js/require_js.phtml
deleted file mode 100644
index 97d0888128561b583f446883da74c1857841846a..0000000000000000000000000000000000000000
--- a/app/code/Magento/Theme/view/frontend/templates/js/require_js.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright © 2015 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-?>
-<script>
- var require = {
- "baseUrl": "<?php echo $this->getViewFileUrl('/') ?>"
- };
-</script>
diff --git a/composer.lock b/composer.lock
index 93a5d90b80b957323204294925c35c08e1903f5b..6ac85b56c4476370da1b85dceb0d61fc31cb399c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2024,29 +2024,32 @@
},
{
"name": "phpmd/phpmd",
- "version": "2.1.3",
+ "version": "2.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpmd/phpmd.git",
- "reference": "1a485d9db869137af5e9678bd844568c92998b25"
+ "reference": "580e6ca75b472a844389ab8df7a0b412901d0d91"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpmd/phpmd/zipball/1a485d9db869137af5e9678bd844568c92998b25",
- "reference": "1a485d9db869137af5e9678bd844568c92998b25",
+ "url": "https://api.github.com/repos/phpmd/phpmd/zipball/580e6ca75b472a844389ab8df7a0b412901d0d91",
+ "reference": "580e6ca75b472a844389ab8df7a0b412901d0d91",
"shasum": ""
},
"require": {
"pdepend/pdepend": "2.0.*",
"php": ">=5.3.0",
- "symfony/config": "2.5.*",
- "symfony/dependency-injection": "2.5.*",
- "symfony/filesystem": "2.5.*"
+ "symfony/config": ">=2.4",
+ "symfony/dependency-injection": ">=2.4",
+ "symfony/filesystem": ">=2.4"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "*"
},
"bin": [
"src/bin/phpmd"
],
- "type": "library",
+ "type": "project",
"autoload": {
"psr-0": {
"PHPMD\\": "src/main/php"
@@ -2056,8 +2059,29 @@
"license": [
"BSD-3-Clause"
],
- "description": "Official version of PHPMD handled with Composer.",
- "time": "2014-09-25 15:56:22"
+ "authors": [
+ {
+ "name": "Manuel Pichler",
+ "email": "github@manuel-pichler.de",
+ "homepage": "https://github.com/manuelpichler",
+ "role": "Project founder"
+ },
+ {
+ "name": "Other contributors",
+ "homepage": "https://github.com/phpmd/phpmd/graphs/contributors",
+ "role": "Contributors"
+ }
+ ],
+ "description": "PHPMD is a spin-off project of PHP Depend and aims to be a PHP equivalent of the well known Java tool PMD.",
+ "homepage": "http://phpmd.org/",
+ "keywords": [
+ "mess detection",
+ "mess detector",
+ "pdepend",
+ "phpmd",
+ "pmd"
+ ],
+ "time": "2015-01-25 13:46:59"
},
{
"name": "phpunit/php-code-coverage",
@@ -2882,17 +2906,17 @@
},
{
"name": "symfony/config",
- "version": "v2.5.9",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Config",
"source": {
"type": "git",
"url": "https://github.com/symfony/Config.git",
- "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e"
+ "reference": "d94f222eff99a22ce313555b78642b4873418d56"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Config/zipball/c7309e33b719433d5cf3845d0b5b9608609d8c8e",
- "reference": "c7309e33b719433d5cf3845d0b5b9608609d8c8e",
+ "url": "https://api.github.com/repos/symfony/Config/zipball/d94f222eff99a22ce313555b78642b4873418d56",
+ "reference": "d94f222eff99a22ce313555b78642b4873418d56",
"shasum": ""
},
"require": {
@@ -2902,7 +2926,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2926,29 +2950,32 @@
],
"description": "Symfony Config Component",
"homepage": "http://symfony.com",
- "time": "2015-01-03 08:01:13"
+ "time": "2015-01-03 08:01:59"
},
{
"name": "symfony/dependency-injection",
- "version": "v2.5.9",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/DependencyInjection",
"source": {
"type": "git",
"url": "https://github.com/symfony/DependencyInjection.git",
- "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3"
+ "reference": "72db9adf2f6c42e773108038bcdaff263f325b4e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/b04e6782962f8e3312274fd16fb6b37a8210a1c3",
- "reference": "b04e6782962f8e3312274fd16fb6b37a8210a1c3",
+ "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/72db9adf2f6c42e773108038bcdaff263f325b4e",
+ "reference": "72db9adf2f6c42e773108038bcdaff263f325b4e",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
},
+ "conflict": {
+ "symfony/expression-language": "<2.6"
+ },
"require-dev": {
"symfony/config": "~2.2",
- "symfony/expression-language": "~2.4,>=2.4.10",
+ "symfony/expression-language": "~2.6",
"symfony/yaml": "~2.1"
},
"suggest": {
@@ -2959,7 +2986,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -2983,7 +3010,7 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "http://symfony.com",
- "time": "2015-01-05 08:51:41"
+ "time": "2015-01-05 17:41:06"
},
{
"name": "symfony/event-dispatcher",
@@ -3045,17 +3072,17 @@
},
{
"name": "symfony/filesystem",
- "version": "v2.5.9",
+ "version": "v2.6.3",
"target-dir": "Symfony/Component/Filesystem",
"source": {
"type": "git",
"url": "https://github.com/symfony/Filesystem.git",
- "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea"
+ "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/Filesystem/zipball/d3c24d7d6e9c342008d8421b2fade460311647ea",
- "reference": "d3c24d7d6e9c342008d8421b2fade460311647ea",
+ "url": "https://api.github.com/repos/symfony/Filesystem/zipball/a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
+ "reference": "a1f566d1f92e142fa1593f4555d6d89e3044a9b7",
"shasum": ""
},
"require": {
@@ -3064,7 +3091,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.6-dev"
}
},
"autoload": {
@@ -3088,7 +3115,7 @@
],
"description": "Symfony Filesystem Component",
"homepage": "http://symfony.com",
- "time": "2015-01-03 21:04:44"
+ "time": "2015-01-03 21:13:09"
},
{
"name": "symfony/stopwatch",