MAGETWO-70141-PR-9358: Merge branch 'Fix_coding_standard_in_Framework-Code' of git://github.com/dverkade/magento2 into MAGETWO-70141-PR-9358

Conflicts:
	lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForContextAggregation.php

Author: ishakhsuvarov

lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Code\Test\Unit;
 
 use Magento\Framework\Code\Generator;

lib/internal/Magento/Framework/Code/Test/Unit/Reader/_files/ClassesForArgumentsReader.php

@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 class ClassWithAllArgumentTypes
 {
     const DEFAULT_VALUE = 'Const Value';

lib/internal/Magento/Framework/Code/Test/Unit/Validator/ConstructorArgumentTypesTest.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\Framework\Code\Test\Unit\Validator;
 
 class ConstructorArgumentTypesTest extends \PHPUnit_Framework_TestCase

lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForArgumentSequence.php

@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace ArgumentSequence;
 
 class ContextObject implements \Magento\Framework\ObjectManager\ContextInterface

lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForConstructorIntegrity.php

@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 class ClassA
 {
 }
@@ -16,16 +14,16 @@ class ClassB
 class ClassC
 {
 }
-interface InterfaceA
+interface FirstInterface
 {
 }
-class ImplementationOfInterfaceA implements InterfaceA
+class ImplementationOfFirstInterface implements FirstInterface
 {
 }
-interface InterfaceB
+interface SecondInterface
 {
 }
-class ImplementationOfInterfaceB implements InterfaceB
+class ImplementationOfSecondInterface implements SecondInterface
 {
 }
 class Context implements \Magento\Framework\ObjectManager\ContextInterface
@@ -46,21 +44,21 @@ class Context implements \Magento\Framework\ObjectManager\ContextInterface
     protected $_exC;
 
     /**
-     * @var InterfaceA
+     * @var FirstInterface
      */
     protected $_interfaceA;
 
     /**
-     * @var ImplementationOfInterfaceB
+     * @var ImplementationOfSecondInterface
      */
     protected $_implOfBInterface;
 
     public function __construct(
         \ClassA $exA,
         \ClassB $exB,
         \ClassC $exC,
-        \InterfaceA $interfaceA,
-        \ImplementationOfInterfaceB $implOfBInterface
+        \FirstInterface $interfaceA,
+        \ImplementationOfSecondInterface $implOfBInterface
     ) {
         $this->_exA = $exA;
         $this->_exB = $exB;

lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForContextAggregation.php

@@ -5,8 +5,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace TypeDuplication;
 
 interface ArgumentInterface

lib/internal/Magento/Framework/Code/Test/Unit/Validator/_files/ClassesForTypeDuplication.php

@@ -4,8 +4,6 @@
  * See COPYING.txt for license details.
  */
 
-// @codingStandardsIgnoreFile
-
 namespace Magento\SomeModule\Model;
 
 use Magento\SomeModule\Model\Two\Test as TestTwo;
@@ -43,6 +41,4 @@ public static function testMethod1(array &$data = array());
     public function testMethod2($data = 'test_default', $flag = true);
 
     public function testMethod3();
-
-
 }