From 5f4498643704003f656256aa738204b3fa352b30 Mon Sep 17 00:00:00 2001
From: Volodymyr Kublytskyi <vkublytskyi@magento.com>
Date: Thu, 3 Nov 2016 14:14:22 +0200
Subject: [PATCH 1/2] MAGETWO-60460: Remove minor changes in Payment and Vault
 API

---
 app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php    | 2 --
 app/code/Magento/Payment/Api/PaymentMethodListInterface.php     | 2 --
 .../Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php     | 1 -
 app/code/Magento/Vault/Api/PaymentMethodListInterface.php       | 1 -
 app/code/Magento/Vault/Block/AbstractTokenRenderer.php          | 1 -
 app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php    | 1 -
 app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php     | 1 -
 app/code/Magento/Vault/Model/CreditCardTokenFactory.php         | 1 -
 8 files changed, 10 deletions(-)

diff --git a/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php b/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
index 881595f60e541..b16d087db1d07 100644
--- a/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
+++ b/app/code/Magento/Payment/Api/Data/PaymentMethodInterface.php
@@ -7,8 +7,6 @@
 
 /**
  * Payment method interface.
- *
- * @api
  */
 interface PaymentMethodInterface
 {
diff --git a/app/code/Magento/Payment/Api/PaymentMethodListInterface.php b/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
index faf231562d9ed..ec9764cbc443e 100644
--- a/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
+++ b/app/code/Magento/Payment/Api/PaymentMethodListInterface.php
@@ -7,8 +7,6 @@
 
 /**
  * Payment method list interface.
- *
- * @api
  */
 interface PaymentMethodListInterface
 {
diff --git a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
index 2969eca4f5eba..c3aa0a0599597 100644
--- a/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
+++ b/app/code/Magento/Vault/Api/Data/PaymentTokenInterfaceFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Interface PaymentTokenInterfaceFactory
- * @api
  */
 interface PaymentTokenInterfaceFactory
 {
diff --git a/app/code/Magento/Vault/Api/PaymentMethodListInterface.php b/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
index f9d3e628594ef..4fd7ab7f75457 100644
--- a/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
+++ b/app/code/Magento/Vault/Api/PaymentMethodListInterface.php
@@ -10,7 +10,6 @@
 /**
  * Contains methods to retrieve vault payment methods
  * This interface is consistent with \Magento\Payment\Api\PaymentMethodListInterface
- * @api
  */
 interface PaymentMethodListInterface
 {
diff --git a/app/code/Magento/Vault/Block/AbstractTokenRenderer.php b/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
index 15df2e772a342..34d2f4b8bad07 100644
--- a/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
+++ b/app/code/Magento/Vault/Block/AbstractTokenRenderer.php
@@ -11,7 +11,6 @@
 
 /**
  * Class AbstractTokenRenderer
- * @api
  */
 abstract class AbstractTokenRenderer extends Template implements TokenRendererInterface, IconInterface
 {
diff --git a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
index 24bd03d42bb20..d982811ab28c8 100644
--- a/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/AbstractPaymentTokenFactory.php
@@ -11,7 +11,6 @@
 
 /**
  * Class AbstractPaymentTokenFactory
- * @api
  */
 abstract class AbstractPaymentTokenFactory implements PaymentTokenInterfaceFactory
 {
diff --git a/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
index 553b922bf7387..bbc64cdffc84f 100644
--- a/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
+++ b/app/code/Magento/Vault/Model/AccountPaymentTokenFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Class AccountPaymentTokenFactory
- * @api
  */
 class AccountPaymentTokenFactory extends AbstractPaymentTokenFactory
 {
diff --git a/app/code/Magento/Vault/Model/CreditCardTokenFactory.php b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
index e1de0354cc37b..87fb10d0f8187 100644
--- a/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
+++ b/app/code/Magento/Vault/Model/CreditCardTokenFactory.php
@@ -7,7 +7,6 @@
 
 /**
  * Class CreditCardTokenFactory
- * @api
  */
 class CreditCardTokenFactory extends AbstractPaymentTokenFactory
 {

From 3d57b8f3ac4f18036959747f641994e111c90604 Mon Sep 17 00:00:00 2001
From: Volodymyr Kublytskyi <vkublytskyi@magento.com>
Date: Thu, 3 Nov 2016 17:16:42 +0200
Subject: [PATCH 2/2] MAGETWO-60460: Remove minor changes in Payment and Vault
 API

 - MAGETWO-60471: Remove ApiAnnotationTest for API namespace
---
 .../Test/Integrity/ApiAnnotationTest.php      | 40 -------------------
 1 file changed, 40 deletions(-)
 delete mode 100644 dev/tests/static/testsuite/Magento/Test/Integrity/ApiAnnotationTest.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ApiAnnotationTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ApiAnnotationTest.php
deleted file mode 100644
index a1e7c25e3d600..0000000000000
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ApiAnnotationTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Scan source code for unmarked API interfaces
- *
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\Test\Integrity;
-
-use Magento\Framework\App\Utility\Files;
-use Magento\Framework\Component\ComponentRegistrar;
-
-class ApiAnnotationTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * API annotation pattern
-     */
-    private $apiAnnotation  = '~/\*{2}(.*@api.*)\*/\s+(?=interface)~s';
-
-    public function testApiAnnotations()
-    {
-        $modulePaths = array_map(function ($path) {
-            return $path . DIRECTORY_SEPARATOR .  'Api';
-        }, (new ComponentRegistrar())->getPaths(ComponentRegistrar::MODULE));
-
-        foreach (Files::init()->getFiles($modulePaths, '*.php', true) as $file) {
-            $fileContent = file_get_contents($file);
-            if (!preg_match($this->apiAnnotation, $fileContent)) {
-                $result[] = $file;
-            }
-        }
-        if (!empty($result)) {
-            $this->fail(sprintf(
-                'Found %s file(s) without @api annotations under Api namespace: %s',
-                count($result),
-                PHP_EOL . implode(PHP_EOL, $result)
-            ));
-        }
-    }
-}