diff --git a/.php_cs b/.php_cs index 5bd1a01537611de83ce9e9a8bb4bae01da274a9f..4bd705bb09a2f2bb25c0dcc69d1e48156a9fb7aa 100644 --- a/.php_cs +++ b/.php_cs @@ -1,6 +1,6 @@ <?php /** - * Copyright © 2016 Magento. All rights reserved. + * Copyright © 2013-2017 Magento, Inc. All rights reserved. * See COPYING.txt for license details. */ diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php b/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php index be8878197b77a595cb1264d9e67e895b9f633f6a..ef2e81d4970693fefc81935b6e88c1e3ee26a5d2 100644 --- a/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php +++ b/app/code/Magento/Sales/Model/ResourceModel/Order/CollectionFactory.php @@ -33,7 +33,7 @@ class CollectionFactory implements CollectionFactoryInterface */ public function __construct( \Magento\Framework\ObjectManagerInterface $objectManager, - $instanceName = '\\Magento\\Sales\\Model\\ResourceModel\\Order\\Collection' + $instanceName = \Magento\Sales\Model\ResourceModel\Order\Collection::class ) { $this->objectManager = $objectManager; $this->instanceName = $instanceName; diff --git a/dev/tests/js/jasmine/assets/text/external.html b/dev/tests/js/jasmine/assets/text/external.html index 8f3539355536c2e4e38192721603a8d2de958a7d..d1cc2763b67b294dabe5f4dee2381bf74a38576f 100644 --- a/dev/tests/js/jasmine/assets/text/external.html +++ b/dev/tests/js/jasmine/assets/text/external.html @@ -4,4 +4,4 @@ * See COPYING.txt for license details. */ --> -<span>External Template</span> +<span>External Template</span> \ No newline at end of file