commit a935f57d8c91cf32463947e5a8d3438b3ab8c890
Author: Bart Feenstra <bart@mynameisbart.com>
Date:   Wed Oct 9 12:05:38 2013 +0200

    Issue #2108061 by Xano: Descriptive names for renderable elements.

diff --git a/payment/lib/Drupal/payment/Element/PaymentLineItem.php b/payment/lib/Drupal/payment/Element/PaymentLineItemsInput.php
similarity index 98%
rename from payment/lib/Drupal/payment/Element/PaymentLineItem.php
rename to payment/lib/Drupal/payment/Element/PaymentLineItemsInput.php
index 27f70ae..d55d6b4 100644
--- a/payment/lib/Drupal/payment/Element/PaymentLineItem.php
+++ b/payment/lib/Drupal/payment/Element/PaymentLineItemsInput.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\payment\Element\PaymentLineItem.
+ * Contains \Drupal\payment\Element\PaymentLineItemsInput.
  */
 
 namespace Drupal\payment\Element;
@@ -13,9 +13,9 @@ use Drupal\Core\Ajax\RemoveCommand;
 use Drupal\payment\Plugin\payment\line_item\PaymentLineItemInterface;
 
 /**
- * Provides form callbacks for the payment_line_item form element.
+ * Provides form callbacks for the payment_line_items_input form element.
  */
-class PaymentLineItem {
+class PaymentLineItemsInput {
 
   /**
    * An unlimited cardinality.
diff --git a/payment/lib/Drupal/payment/Element/PaymentMethod.php b/payment/lib/Drupal/payment/Element/PaymentPaymentMethodInput.php
similarity index 97%
rename from payment/lib/Drupal/payment/Element/PaymentMethod.php
rename to payment/lib/Drupal/payment/Element/PaymentPaymentMethodInput.php
index e9d13af..f7d25db 100644
--- a/payment/lib/Drupal/payment/Element/PaymentMethod.php
+++ b/payment/lib/Drupal/payment/Element/PaymentPaymentMethodInput.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\payment\Element\PaymentMethod.
+ * Contains \Drupal\payment\Element\PaymentPaymentMethodInput.
  */
 
 namespace Drupal\payment\Element;
@@ -11,9 +11,9 @@ use Drupal\Component\Utility\NestedArray;
 use Drupal\payment\Entity\PaymentInterface;
 
 /**
- * Provides form callbacks for the payment_method form element.
+ * Provides form callbacks for the payment_payment_method_input form element.
  */
-class PaymentMethod {
+class PaymentPaymentMethodInput {
 
   /**
    * Implements form #process callback.
diff --git a/payment/lib/Drupal/payment/Tests/Element/PaymentLineItemWebTest.php b/payment/lib/Drupal/payment/Tests/Element/PaymentLineItemsInputWebTest.php
similarity index 95%
rename from payment/lib/Drupal/payment/Tests/Element/PaymentLineItemWebTest.php
rename to payment/lib/Drupal/payment/Tests/Element/PaymentLineItemsInputWebTest.php
index d38289a..863fd99 100644
--- a/payment/lib/Drupal/payment/Tests/Element/PaymentLineItemWebTest.php
+++ b/payment/lib/Drupal/payment/Tests/Element/PaymentLineItemsInputWebTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains class \Drupal\payment\Tests\PaymentLineItemWebTest.
+ * Contains class \Drupal\payment\Tests\PaymentLineItemsInputWebTest.
  */
 
 namespace Drupal\payment\Tests\Element;
@@ -12,9 +12,9 @@ use Drupal\payment\Plugin\payment\line_item\PaymentLineItemInterface;
 use Drupal\simpletest\WebTestBase ;
 
 /**
- * Tests the payment_line_item element.
+ * Tests the payment_line_items_input element.
  */
-class PaymentLineItemWebTest extends WebTestBase {
+class PaymentLineItemsInputWebTest extends WebTestBase {
 
   /**
    * {@inheritdoc}
@@ -27,7 +27,7 @@ class PaymentLineItemWebTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'description' => '',
-      'name' => 'payment_line_item element',
+      'name' => 'payment_line_items_input element',
       'group' => 'Payment',
     );
   }
diff --git a/payment/lib/Drupal/payment/Tests/Element/PaymentMethodWebTest.php b/payment/lib/Drupal/payment/Tests/Element/PaymentPaymentMethodInputWebTest.php
similarity index 95%
rename from payment/lib/Drupal/payment/Tests/Element/PaymentMethodWebTest.php
rename to payment/lib/Drupal/payment/Tests/Element/PaymentPaymentMethodInputWebTest.php
index f910f5c..814e74c 100644
--- a/payment/lib/Drupal/payment/Tests/Element/PaymentMethodWebTest.php
+++ b/payment/lib/Drupal/payment/Tests/Element/PaymentPaymentMethodInputWebTest.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains class \Drupal\payment\Tests\PaymentMethodWebTest.
+ * Contains class \Drupal\payment\Tests\PaymentPaymentMethodInputWebTest.
  */
 
 namespace Drupal\payment\Tests\Element;
@@ -11,9 +11,9 @@ use Drupal\payment\Generate;
 use Drupal\simpletest\WebTestBase ;
 
 /**
- * Tests the payment_method element.
+ * Tests the payment_payment_method_input element.
  */
-class PaymentMethodWebTest extends WebTestBase {
+class PaymentPaymentMethodInputWebTest extends WebTestBase {
 
   /**
    * {@inheritdoc}
@@ -26,7 +26,7 @@ class PaymentMethodWebTest extends WebTestBase {
   public static function getInfo() {
     return array(
       'description' => '',
-      'name' => 'payment_method element',
+      'name' => 'payment_payment_method_input element',
       'group' => 'Payment',
     );
   }
diff --git a/payment/payment.module b/payment/payment.module
index 70b5f18..58299c6 100644
--- a/payment/payment.module
+++ b/payment/payment.module
@@ -5,7 +5,7 @@
  * Hook implementations and shared functions.
  */
 
-use Drupal\payment\Element\PaymentLineItem;
+use Drupal\payment\Element\PaymentLineItemsInput;
 use Drupal\payment\Entity\PaymentInterface;
 use Drupal\payment\Plugin\payment\line_item\Basic;
 
@@ -229,7 +229,7 @@ function payment_field_extra_fields() {
  */
 function payment_element_info() {
   // A payment method selection and configuration element for a payment.
-  $elements['payment_method'] = array(
+  $elements['payment_payment_method_input'] = array(
     // A \Drupal\payment\Plugin'Core\Entity\PaymentInterface object.
     '#default_value' => NULL,
     '#input' => TRUE,
@@ -238,28 +238,28 @@ function payment_element_info() {
     // valid, the element will not expand to a select list, but will appear to
     // the user as if there only is one payment method available at all.
     '#payment_method_ids' => array(),
-    '#process' => array(array('\Drupal\payment\Element\PaymentMethod', 'process')),
+    '#process' => array(array('\Drupal\payment\Element\PaymentPaymentMethodInput', 'process')),
     '#tree' => TRUE,
   );
 
   // Line item configuration. Use
-  // \Drupal\payment\Element\PaymentLineItem::getLineItems() to get the
+  // \Drupal\payment\Element\PaymentLineItemsInput::getLineItems() to get the
   // 'return' value.
-  $elements['payment_line_items'] = array(
+  $elements['payment_line_items_input'] = array(
     '#attached' => array(
       'css' => array(drupal_get_path('module', 'payment') . '/css/payment.css'),
     ),
     // The number of values this element allows, which must be at least as many
     // as the number of line items in the default value. For unlimited values,
-    // use \Drupal\payment\Element\PaymentLineItem::CARDINALITY_UNLIMITED.
-    '#cardinality' => PaymentLineItem::CARDINALITY_UNLIMITED,
+    // use \Drupal\payment\Element\PaymentLineItemsInput::CARDINALITY_UNLIMITED.
+    '#cardinality' => PaymentLineItemsInput::CARDINALITY_UNLIMITED,
     // An array of
     // \Drupal\payment\Plugin\payment\line_item\PaymentLineItemInterface
     // objects.
     '#default_value' => array(),
-    '#element_validate' => array(array('\Drupal\payment\Element\PaymentLineItem', 'validate')),
+    '#element_validate' => array(array('\Drupal\payment\Element\PaymentLineItemsInput', 'validate')),
     '#input' => TRUE,
-    '#process' => array('form_process_container', array('\Drupal\payment\Element\PaymentLineItem', 'process')),
+    '#process' => array('form_process_container', array('\Drupal\payment\Element\PaymentLineItemsInput', 'process')),
     '#tree' => TRUE,
     '#theme_wrappers' => array('container'),
     '#value' => array(),
diff --git a/payment/payment.ui.inc b/payment/payment.ui.inc
index 6aefc3e..930f473 100644
--- a/payment/payment.ui.inc
+++ b/payment/payment.ui.inc
@@ -46,7 +46,7 @@ function payment_form_embedded(array &$form_state, Payment $payment, array $pmid
   $elements['payment_line_items'] = payment_line_items($payment);
   $elements['payment_method'] = array(
     '#access' => payment_status_is_or_has_ancestor($payment->getStatus()->status, PAYMENT_STATUS_NEW),
-    '#type' => 'payment_method',
+    '#type' => 'payment_payment_method_input',
     '#title' => t('Payment method'),
     '#required' => TRUE,
     '#pmids' => $pmids,
diff --git a/payment_form/lib/Drupal/payment_form/Entity/PaymentFormController.php b/payment_form/lib/Drupal/payment_form/Entity/PaymentFormController.php
index ae5d945..6b38041 100644
--- a/payment_form/lib/Drupal/payment_form/Entity/PaymentFormController.php
+++ b/payment_form/lib/Drupal/payment_form/Entity/PaymentFormController.php
@@ -8,7 +8,7 @@
 namespace Drupal\payment_form\Entity;
 
 use Drupal\Core\Entity\EntityFormController;
-use Drupal\payment\Element\PaymentMethod;
+use Drupal\payment\Element\PaymentPaymentMethodInput;
 
 /**
  * Provides the payment form.
@@ -26,7 +26,7 @@ class PaymentFormController extends EntityFormController {
     );
     $form['payment_method'] = array(
       '#default_value' => clone $payment,
-      '#type' => 'payment_method',
+      '#type' => 'payment_payment_method_input',
     );
 
     return parent::form($form, $form_state);
@@ -36,7 +36,7 @@ class PaymentFormController extends EntityFormController {
    * {@inheritdoc}
    */
   public function submit(array $form, array &$form_state) {
-    $payment = PaymentMethod::getPayment($form['payment_method'], $form_state);
+    $payment = PaymentPaymentMethodInput::getPayment($form['payment_method'], $form_state);
     $payment->save();
     $payment->execute();
   }
diff --git a/payment_form/lib/Drupal/payment_form/Plugin/field/widget/PaymentForm.php b/payment_form/lib/Drupal/payment_form/Plugin/field/widget/PaymentForm.php
index 8616eb1..cbc249e 100644
--- a/payment_form/lib/Drupal/payment_form/Plugin/field/widget/PaymentForm.php
+++ b/payment_form/lib/Drupal/payment_form/Plugin/field/widget/PaymentForm.php
@@ -12,7 +12,7 @@ use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Entity\Field\FieldItemListInterface;
 use Drupal\field\Annotation\FieldWidget;
 use Drupal\field\Plugin\Type\Widget\WidgetBase;
-use Drupal\payment\Element\PaymentLineItem;
+use Drupal\payment\Element\PaymentLineItemsInput;
 
 /**
  * A payment configuration widget.
@@ -66,7 +66,7 @@ class PaymentForm extends WidgetBase {
     $element['line_items'] = array(
       '#cardinality' => $this->fieldDefinition->getFieldCardinality(),
       '#default_value' => $line_items,
-      '#type' => 'payment_line_items',
+      '#type' => 'payment_line_items_input',
     );
 
     return $element;
@@ -78,7 +78,7 @@ class PaymentForm extends WidgetBase {
   public function massageFormValues(array $values, array $form, array &$form_state) {
     $element = NestedArray::getValue($form, array_merge(array_slice($values['array_parents'], count($form['#array_parents'])), array('line_items')));
 
-    return PaymentLineItem::getLineItems($element, $form_state);
+    return PaymentLineItemsInput::getLineItems($element, $form_state);
   }
 
 }
diff --git a/payment_test/lib/Drupal/payment_test/PaymentLineItemElement.php b/payment_test/lib/Drupal/payment_test/PaymentLineItemElement.php
index 2cb715a..004c68c 100644
--- a/payment_test/lib/Drupal/payment_test/PaymentLineItemElement.php
+++ b/payment_test/lib/Drupal/payment_test/PaymentLineItemElement.php
@@ -9,7 +9,7 @@ namespace Drupal\payment_test;
 
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\FormInterface;
-use Drupal\payment\Element\PaymentLineItem;
+use Drupal\payment\Element\PaymentLineItemsInput;
 use Drupal\payment\Generate;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -37,7 +37,7 @@ class PaymentLineItemElement implements ContainerInjectionInterface, FormInterfa
     $form['container']['line_item'] = array(
       '#cardinality' => 4,
       '#default_value' => Generate::createPaymentLineItems(),
-      '#type' => 'payment_line_items',
+      '#type' => 'payment_line_items_input',
     );
     $form['submit'] = array(
       '#type' => 'submit',
diff --git a/payment_test/lib/Drupal/payment_test/PaymentMethodElement.php b/payment_test/lib/Drupal/payment_test/PaymentMethodElement.php
index 966346f..1803dce 100644
--- a/payment_test/lib/Drupal/payment_test/PaymentMethodElement.php
+++ b/payment_test/lib/Drupal/payment_test/PaymentMethodElement.php
@@ -10,7 +10,7 @@ namespace Drupal\payment_test;
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Entity\EntityManager;
 use Drupal\Core\Form\FormInterface;
-use Drupal\payment\Element\PaymentMethod;
+use Drupal\payment\Element\PaymentPaymentMethodInput;
 use Drupal\payment\Generate;
 use Drupal\payment\Plugin\payment\type\Manager;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -56,7 +56,7 @@ class PaymentMethodElement implements ContainerInjectionInterface, FormInterface
     $form['payment_method'] = array(
       '#default_value' => $payment,
       '#required' => TRUE,
-      '#type' => 'payment_method',
+      '#type' => 'payment_payment_method_input',
     );
     $form['submit'] = array(
       '#type' => 'submit',