Skip to content

Commit 38e14de

Browse files
ishakhsuvarovishakhsuvarov
committed
MAGETWO-70787: update phpserver to support versioned static urls #10250
- Merge Pull Request #10250 from Flyingmana/magento2:patch-11 - Merged commits: 1. 27e7614 2. 9e65c06 3. eed28fa 4. e42e09a
2 parents d844e31 + e42e09a commit 38e14de

File tree

2,904 files changed

+54804
-16723
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,904 files changed

+54804
-16723
lines changed

‎.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
sudo: required
22
dist: trusty
3+
group: edge
34
addons:
45
apt:
56
packages:

‎CODE_OF_CONDUCT.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
## Our Standards
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
## Our Responsibilities
26+
27+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
28+
29+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
30+
31+
## Scope
32+
33+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
34+
35+
## Enforcement
36+
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
38+
39+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
40+
41+
## Attribution
42+
43+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
44+
45+
[homepage]: http://contributor-covenant.org
46+
[version]: http://contributor-covenant.org/version/1/4/

‎app/bootstrap.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,5 @@
6363
date_default_timezone_set('UTC');
6464

6565
/* Adjustment of precision value for several versions of PHP */
66-
ini_set('precision', 17);
67-
ini_set('serialize_precision', 17);
66+
ini_set('precision', 15);
67+
ini_set('serialize_precision', 15);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Controller\Adminhtml;
99

10+
/**
11+
* @api
12+
*/
1013
abstract class Notification extends \Magento\Backend\App\AbstractAction
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/Config/Source/Frequency.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification update frequency source
1010
*
1111
* @codeCoverageIgnore
12+
* @api
1213
*/
1314
class Frequency implements \Magento\Framework\Option\ArrayInterface
1415
{

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*
1313
* @author Magento Core Team <[email protected]>
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
* @api
1516
*/
1617
class Feed extends \Magento\Framework\Model\AbstractModel
1718
{

‎app/code/Magento/AdminNotification/Model/Inbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @method int getIsRemove()
3030
* @method \Magento\AdminNotification\Model\Inbox setIsRemove(int $value)
3131
*
32-
* @author Magento Core Team <[email protected]>
32+
* @api
3333
*/
3434
class Inbox extends \Magento\Framework\Model\AbstractModel implements NotifierInterface, InboxInterface
3535
{

‎app/code/Magento/AdminNotification/Model/InboxInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* AdminNotification Inbox interface
1010
*
1111
* @author Magento Core Team <[email protected]>
12+
* @api
1213
*/
1314
interface InboxInterface
1415
{

‎app/code/Magento/AdminNotification/Model/NotificationService.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* Notification service model
1010
*
1111
* @author Magento Core Team <[email protected]>
12+
* @api
1213
*/
1314
class NotificationService
1415
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Grid/Collection.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\AdminNotification\Model\ResourceModel\Grid;
1313

14+
/**
15+
* @api
16+
*/
1417
class Collection extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1518
{
1619
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
namespace Magento\AdminNotification\Model\ResourceModel;
77

88
/**
9-
* AdminNotification Inbox model
10-
*
11-
* @author Magento Core Team <[email protected]>
9+
* @api
1210
*/
1311
class Inbox extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1412
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*
1111
* @api
1212
* @author Magento Core Team <[email protected]>
13+
* @api
1314
*/
1415
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1516
{

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Critical.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
*/
88
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
99

10+
/**
11+
* @api
12+
*/
1013
class Critical extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1114
{
1215
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/Inbox/Collection/Unread.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
*/
1212
namespace Magento\AdminNotification\Model\ResourceModel\Inbox\Collection;
1313

14+
/**
15+
* @api
16+
*/
1417
class Unread extends \Magento\AdminNotification\Model\ResourceModel\Inbox\Collection
1518
{
1619
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System;
77

8+
/**
9+
* @api
10+
*/
811
class Message extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
77

8+
/**
9+
* @api
10+
*/
811
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection/Synchronized.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\ResourceModel\System\Message\Collection;
77

8+
/**
9+
* @api
10+
*/
811
class Synchronized extends \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* @codeCoverageIgnore
10+
* @api
1011
*/
1112
class Message extends \Magento\Framework\Model\AbstractModel implements \Magento\Framework\Notification\MessageInterface
1213
{

‎app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message;
77

8+
/**
9+
* @api
10+
*/
811
class CacheOutdated implements \Magento\Framework\Notification\MessageInterface
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Media/AbstractSynchronization.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message\Media;
77

8+
/**
9+
* @api
10+
*/
811
abstract class AbstractSynchronization implements \Magento\Framework\Notification\MessageInterface
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66

77
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
88

9+
/**
10+
* @api
11+
*/
912
class Error extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
1013
{
1114
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\AdminNotification\Model\System\Message\Media\Synchronization;
77

8+
/**
9+
* @api
10+
*/
811
class Success extends \Magento\AdminNotification\Model\System\Message\Media\AbstractSynchronization
912
{
1013
/**

‎app/code/Magento/AdminNotification/Model/System/Message/Security.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
use Magento\Store\Model\Store;
1010

11+
/**
12+
* @api
13+
*/
1114
class Security implements \Magento\Framework\Notification\MessageInterface
1215
{
1316
/**

‎app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
use Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\SynchronizedFactory;
1010

1111
/**
12-
* Class DataProvider
12+
* @api
1313
*/
1414
class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
1515
{

‎app/code/Magento/AdminNotification/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_AdminNotification',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
"autoOpen": true,
2020
"buttons": false,
2121
"modalClass": "modal-system-messages",
22-
"title": "<?php /* @escapeNotVerified */ echo $block->getHeaderText(); ?>"
22+
"title": "<?= /* @escapeNotVerified */ $block->getHeaderText() ?>"
2323
}
2424
}'>
2525
<li class="message message-warning warning">
26-
<?php /* @escapeNotVerified */ echo $block->getNoticeMessageText(); ?><br/>
27-
<a href="<?php /* @escapeNotVerified */ echo $block->getNoticeMessageUrl(); ?>"><?php /* @escapeNotVerified */ echo $block->getReadDetailsText(); ?></a>
26+
<?= /* @escapeNotVerified */ $block->getNoticeMessageText() ?><br/>
27+
<a href="<?= /* @escapeNotVerified */ $block->getNoticeMessageUrl() ?>"><?= /* @escapeNotVerified */ $block->getReadDetailsText() ?></a>
2828
</li>
2929
</ul>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,31 @@
1515
<?php if ($lastCritical): ?>
1616
<ul class="message-system-list">
1717
<li class="message message-warning error">
18-
<?php /* @escapeNotVerified */ echo $lastCritical->getText();?>
18+
<?= /* @escapeNotVerified */ $lastCritical->getText() ?>
1919
</li>
2020
</ul>
2121
<?php endif; ?>
2222
<div class="message-system-short">
2323
<span class="message-system-short-label">
24-
<?php /* @escapeNotVerified */ echo __('System Messages:')?>
24+
<?= /* @escapeNotVerified */ __('System Messages:') ?>
2525
</span>
2626

2727
<?php if ($block->getCriticalCount()): ?>
2828
<div class="message message-warning error">
29-
<a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Critical System Messages'));?>">
30-
<?php /* @escapeNotVerified */ echo $block->getCriticalCount();?>
29+
<a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
30+
<?= /* @escapeNotVerified */ $block->getCriticalCount() ?>
3131
</a>
3232
</div>
3333
<?php endif;?>
3434

3535
<?php if ($block->getMajorCount()): ?>
3636
<div class="message message-warning warning">
37-
<a class="message-link" href="#" title="<?php echo $block->escapeHtml(__('Major System Messages'));?>">
38-
<?php /* @escapeNotVerified */ echo $block->getMajorCount();?>
37+
<a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
38+
<?= /* @escapeNotVerified */ $block->getMajorCount() ?>
3939
</a>
4040
</div>
4141
<?php endif;?>
4242
</div>
43-
<div id="message-system-all" title="<?php echo $block->escapeHtml(__('System messages'));?>" data-mage-init='<?php echo $block->escapeHtml($block->getSystemMessageDialogJson());?>'></div>
43+
<div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
4444
</div>
4545
</div>

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
?>
1010
<?php /** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */ ?>
1111

12-
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?php echo $block->escapeHtml($block->getPopupTitle()); ?>">
12+
<div style="display:none" id="system_messages_list" data-role="system_messages_list" title="<?= $block->escapeHtml($block->getPopupTitle()) ?>">
1313
<ul class="message-system-list messages">
1414
<?php foreach ($block->getUnreadMessages() as $message): ?>
15-
<li class="message message-warning <?php /* @escapeNotVerified */ echo $block->getItemClass($message);?>">
16-
<?php /* @escapeNotVerified */ echo $message->getText();?>
15+
<li class="message message-warning <?= /* @escapeNotVerified */ $block->getItemClass($message) ?>">
16+
<?= /* @escapeNotVerified */ $message->getText() ?>
1717
</li>
1818
<?php endforeach;?>
1919
</ul>

0 commit comments

Comments
 (0)