Completed
Pull Request — master (#567)
by Chris
56:55 queued 54:34
created
code/account/AccountPage.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
     /**
30 30
      * Return a link to view the order on the account page.
31 31
      *
32
-     * @param int|string $orderID    ID of the order
32
+     * @param integer $orderID    ID of the order
33 33
      * @param boolean    $urlSegment Return the URLSegment only
34 34
      */
35 35
     public static function get_order_link($orderID, $urlSegment = false)
Please login to merge, or discard this patch.
code/account/OrderManipulation.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
      * Get the order via url 'ID' or form submission 'OrderID'.
52 52
      * It will check for permission based on session stored ids or member id.
53 53
      *
54
-     * @return the order
54
+     * @return DataObject|null order
55 55
      */
56 56
     public function orderfromid()
57 57
     {
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
     /**
124 124
      * Build a form for cancelling, or retrying payment for a placed order.
125 125
      *
126
-     * @return Form
126
+     * @return null|OrderActionsForm
127 127
      */
128 128
     public function ActionsForm()
129 129
     {
Please login to merge, or discard this patch.
code/cart/CartEditField.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -90,7 +90,6 @@
 block discarded – undo
90 90
      * Add quantity, variation and remove fields to the
91 91
      * item set.
92 92
      *
93
-     * @param SS_List $items
94 93
      */
95 94
     protected function editableItems()
96 95
     {
Please login to merge, or discard this patch.
code/checkout/CheckoutPage.php 1 patch
Doc Comments   +2 added lines patch added patch discarded remove patch
@@ -21,6 +21,8 @@
 block discarded – undo
21 21
      * Returns the link to the checkout page on this site
22 22
      *
23 23
      * @param boolean $urlSegment If set to TRUE, only returns the URLSegment field
24
+     * @param string $action
25
+     * @param integer $id
24 26
      *
25 27
      * @return string Link to checkout page
26 28
      */
Please login to merge, or discard this patch.
code/checkout/components/CheckoutComponentConfig.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -67,6 +67,7 @@
 block discarded – undo
67 67
      * Returns the first available component with the given class or interface.
68 68
      *
69 69
      * @param String ClassName
70
+     * @param string $type
70 71
      *
71 72
      * @return GridFieldComponent
72 73
      */
Please login to merge, or discard this patch.
code/cms/ShopConfig.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -58,6 +58,9 @@
 block discarded – undo
58 58
         $countriestab->setTitle(_t('ShopConfig.ALLOWED_COUNTRIES_TAB_TITLE', "Allowed Countries"));
59 59
     }
60 60
 
61
+    /**
62
+     * @return string
63
+     */
61 64
     public static function get_base_currency()
62 65
     {
63 66
         return self::config()->base_currency;
Please login to merge, or discard this patch.
code/model/Order.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -362,6 +362,7 @@
 block discarded – undo
362 362
     /**
363 363
      * Check if an order can be paid for.
364 364
      *
365
+     * @param DataObject $member
365 366
      * @return boolean
366 367
      */
367 368
     public function canPay($member = null)
Please login to merge, or discard this patch.
code/model/OrderModifier.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
      *
67 67
      * Sets $this->Amount to the calculated value;
68 68
      *
69
-     * @param $subtotal         - running total to be modified
69
+     * @param integer $subtotal         - running total to be modified
70 70
      * @param $forcecalculation - force calculating the value, if order isn't in cart
71 71
      *
72 72
      * @return $subtotal - updated subtotal
Please login to merge, or discard this patch.
code/modifiers/shipping/SimpleShippingModifier.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -16,6 +16,9 @@
 block discarded – undo
16 16
 
17 17
     private static $charges_by_country = array();
18 18
 
19
+    /**
20
+     * @param integer $subtotal
21
+     */
19 22
     public function value($subtotal = null)
20 23
     {
21 24
         $country = $this->Country();
Please login to merge, or discard this patch.