Inspection of "Fix ISO2 for translated country - FIXED" - GeoDirectory/geodirectory - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — master (#303)

by Kiran

created 2016-12-22 03:50 UTC

Status

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

@@ -44,7 +44,7 @@  discard block
 block discarded – undo
  */
 function geodir_on_wp()
 {
-    if(geodir_is_page('login')) {
+    if (geodir_is_page('login')) {
         geodir_user_signup();
     }
 
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
          * @since 1.0.0
          * @package GeoDirectory
          */
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
         die;
     }
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
  * @todo check if nonce is required here and if so add one.
  */
 function geodir_ajax_handler() {
-    global $wpdb, $gd_session,$post;
+    global $wpdb, $gd_session, $post;
 
     if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
              * @since 1.0.0
              * @package GeoDirectory
              */
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
+            include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');
         } else {
             wp_redirect(geodir_login_url());
             gd_die();
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
                          * @param string $posttype The post type to insert.
                          * @param string $datatype The type of dummy data to insert.
                          */
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
+                        do_action('geodir_delete_dummy_posts', sanitize_key($_REQUEST['posttype']), $datatype);
                     break;
                 case "geodir_dummy_insert" :
                     if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
                     $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
                     $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
 
-                    if (isset($_REQUEST['posttype'])){
+                    if (isset($_REQUEST['posttype'])) {
                         /**
                          * Used to insert the dummy post data per post type.
                          *
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
                          * @param string $datatype The type of dummy data to insert.
                          * @param int $post_index The item number to insert.
                          */
-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
+                        do_action('geodir_insert_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key($_REQUEST['datatype']), absint($_REQUEST['insert_dummy_post_index']));
                     }
 
 
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
         if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
             $template = locate_template(array("geodirectory/popup-forms.php"));
             if (!$template) {
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
+                $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php';
             }
             require_once($template);
         }
@@ -210,17 +210,17 @@  discard block
 block discarded – undo
          * @since 1.0.0
          * @package GeoDirectory
          */
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
+        include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
     }
 
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
         if (is_user_logged_in()) {
             switch ($_REQUEST['ajax_action']):
                 case "add" :
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
+                    geodir_add_to_favorite((int) $_REQUEST['pid']);
                     break;
                 case "remove" :
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
+                    geodir_remove_from_favorite((int) $_REQUEST['pid']);
                     break;
             endswitch;
         } else {
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
 
         $is_current_user_owner = true;
         if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
+            $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);
         }
 
         $request = $gd_session->get('listing');
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
          * @since 1.0.0
          * @package GeoDirectory
          */
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
+        include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');
     }
 
     if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
 }
 
 
-function geodir_show_ga_stats(){
+function geodir_show_ga_stats() {
     if (isset($_REQUEST['ga_start'])) {
         $ga_start = $_REQUEST['ga_start'];
     } else {
@@ -389,5 +389,5 @@  discard block
 block discarded – undo
     geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
     die;
 }
-add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );
-add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
\ No newline at end of file
+add_action('wp_ajax_gdga', 'geodir_show_ga_stats');
+add_action('wp_ajax_nopriv_gdga', 'geodir_show_ga_stats');
\ No newline at end of file

Please login to merge, or discard this patch.

Braces +27 added lines, -20 removed lines patch added patch discarded remove patch

@@ -112,10 +112,11 @@  discard block
 block discarded – undo
     }
 
     if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
+        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) {
+                    geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
+        } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) {
+                    geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
+        }
     }
 
     if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
@@ -137,12 +138,13 @@  discard block
 block discarded – undo
         if (current_user_can('manage_options')) {
             switch ($_REQUEST['geodir_autofill']):
                 case "geodir_dummy_delete" :
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
-                        return;
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
+                                            return;
+                    }
 
                     $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
-                    if (isset($_REQUEST['posttype']))
-                        /**
+                    if (isset($_REQUEST['posttype'])) {
+                                            /**
                          * Used to delete the dummy post data per post type.
                          *
                          * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
@@ -151,11 +153,13 @@  discard block
 block discarded – undo
                          * @param string $posttype The post type to insert.
                          * @param string $datatype The type of dummy data to insert.
                          */
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
+                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
+                    }
                     break;
                 case "geodir_dummy_insert" :
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
-                        return;
+                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
+                                            return;
+                    }
 
                     global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
                     $city_bound_lat1 = $_REQUEST['city_bound_lat1'];
@@ -254,8 +258,9 @@  discard block
 block discarded – undo
                         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
                             $redirect_to = get_permalink(geodir_add_listing_page_id());
                             $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
-                        } else
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
+                        } else {
+                                                    $redirect_to = get_permalink(geodir_add_listing_page_id());
+                        }
 
                         wp_redirect($redirect_to);
                     } else {
@@ -268,9 +273,9 @@  discard block
 block discarded – undo
 
                     $gd_session->un_set('listing');
 
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
-                        wp_redirect(get_permalink($_REQUEST['pid']));
-                    else {
+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) {
+                                            wp_redirect(get_permalink($_REQUEST['pid']));
+                    } else {
                         geodir_remove_temp_images();
                         wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
                     }
@@ -298,8 +303,9 @@  discard block
 block discarded – undo
                             } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
                                 $redirect_to = get_permalink(geodir_add_listing_page_id());
                                 $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
-                            } else
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
+                            } else {
+                                                            $redirect_to = get_permalink(geodir_add_listing_page_id());
+                            }
 
                             $gd_session->un_set('listing');
                             wp_redirect($redirect_to);
@@ -320,8 +326,9 @@  discard block
 block discarded – undo
                             $lastid = wp_delete_post($_REQUEST['pid']);
                         }
 
-                        if ($lastid && !is_wp_error($lastid))
-                            wp_redirect($_SERVER['HTTP_REFERER']);
+                        if ($lastid && !is_wp_error($lastid)) {
+                                                    wp_redirect($_SERVER['HTTP_REFERER']);
+                        }
 
                         //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
                     }

Please login to merge, or discard this patch.

Indentation +310 added lines, -310 removed lines patch added patch discarded remove patch

@@ -16,22 +16,22 @@  discard block
 block discarded – undo
  */
 function geodir_on_wp_loaded()
 {
-    /**
-     * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.
-     *
-     * @since 1.0.0
-     */
-    do_action('giodir_handle_request_plugins_loaded');
-    global $wpdb;
+	/**
+	 * Called on the wp_loaded WP hook and used to send the send inquiry and send to friend forms.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('giodir_handle_request_plugins_loaded');
+	global $wpdb;
 
 
-    if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
-        geodir_send_inquiry($_REQUEST); // function in custom_functions.php
+	if (isset($_POST['sendact']) && $_POST['sendact'] == 'send_inqury') {
+		geodir_send_inquiry($_REQUEST); // function in custom_functions.php
 
-    } elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
-        geodir_send_friend($_REQUEST); // function in custom_functions.php
+	} elseif (isset($_POST['sendact']) && $_POST['sendact'] == 'email_frnd') {
+		geodir_send_friend($_REQUEST); // function in custom_functions.php
 
-    }
+	}
 
 }
 
@@ -44,9 +44,9 @@  discard block
 block discarded – undo
  */
 function geodir_on_wp()
 {
-    if(geodir_is_page('login')) {
-        geodir_user_signup();
-    }
+	if(geodir_is_page('login')) {
+		geodir_user_signup();
+	}
 
 }
 
@@ -59,32 +59,32 @@  discard block
 block discarded – undo
  */
 function geodir_on_init()
 {
-    /**
-     * Called on the wp_init WP hook at the start of the geodir_on_init() function.
-     *
-     * @since 1.0.0
-     */
-    do_action('giodir_handle_request');
-    global $wpdb;
+	/**
+	 * Called on the wp_init WP hook at the start of the geodir_on_init() function.
+	 *
+	 * @since 1.0.0
+	 */
+	do_action('giodir_handle_request');
+	global $wpdb;
 
 
 
 
-    if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
-        show_admin_bar(false);
-    }
+	if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && !current_user_can('manage_options') && !class_exists('BuddyPress')) {
+		show_admin_bar(false);
+	}
 
 
-    if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
-        /**
-         * Contains map marker functions.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
-        die;
-    }
+	if (isset($_REQUEST['ptype']) && $_REQUEST['ptype'] == 'get_markers') {
+		/**
+		 * Contains map marker functions.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
+		die;
+	}
 
 
 
@@ -104,290 +104,290 @@  discard block
 block discarded – undo
  * @todo check if nonce is required here and if so add one.
  */
 function geodir_ajax_handler() {
-    global $wpdb, $gd_session,$post;
+	global $wpdb, $gd_session,$post;
 
-    if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
+	if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
 		$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
-        echo '1';
-    }
-
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
-        if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
-            geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
-        else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
-            geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
-    }
-
-    if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
-        if (current_user_can('manage_options')) {
-            /**
-             * Contains admin ajax handling functions.
-             *
-             * @since 1.0.0
-             * @package GeoDirectory
-             */
-            include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
-        } else {
-            wp_redirect(geodir_login_url());
-            gd_die();
-        }
-    }
-
-    if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
-        if (current_user_can('manage_options')) {
-            switch ($_REQUEST['geodir_autofill']):
-                case "geodir_dummy_delete" :
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
-                        return;
-
-                    $datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
-                    if (isset($_REQUEST['posttype']))
-                        /**
-                         * Used to delete the dummy post data per post type.
-                         *
-                         * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
-                         *
-                         * @since 1.6.11
-                         * @param string $posttype The post type to insert.
-                         * @param string $datatype The type of dummy data to insert.
-                         */
-                        do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
-                    break;
-                case "geodir_dummy_insert" :
-                    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
-                        return;
-
-                    global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
-                    $city_bound_lat1 = $_REQUEST['city_bound_lat1'];
-                    $city_bound_lng1 = $_REQUEST['city_bound_lng1'];
-                    $city_bound_lat2 = $_REQUEST['city_bound_lat2'];
-                    $city_bound_lng2 = $_REQUEST['city_bound_lng2'];
-
-                    if (isset($_REQUEST['posttype'])){
-                        /**
-                         * Used to insert the dummy post data per post type.
-                         *
-                         * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
-                         *
-                         * @since 1.6.11
-                         * @param string $posttype The post type to insert.
-                         * @param string $datatype The type of dummy data to insert.
-                         * @param int $post_index The item number to insert.
-                         */
-                        do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
-                    }
-
-
-                    break;
-            endswitch;
-        } else {
-            wp_redirect(geodir_login_url());
-            exit();
-        }
-    }
-
-    if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
-
-        if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
-            $template = locate_template(array("geodirectory/popup-forms.php"));
-            if (!$template) {
-                $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
-            }
-            require_once($template);
-        }
-
-        gd_die();
-    }
-
-    /*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
+		echo '1';
+	}
+
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
+		if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
+			geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
+		else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
+			geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
+	}
+
+	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') || isset($_REQUEST['create_field']) || isset($_REQUEST['sort_create_field'])) {
+		if (current_user_can('manage_options')) {
+			/**
+			 * Contains admin ajax handling functions.
+			 *
+			 * @since 1.0.0
+			 * @package GeoDirectory
+			 */
+			include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
+		} else {
+			wp_redirect(geodir_login_url());
+			gd_die();
+		}
+	}
+
+	if (isset($_REQUEST['geodir_autofill']) && $_REQUEST['geodir_autofill'] != '' && isset($_REQUEST['_wpnonce'])) {
+		if (current_user_can('manage_options')) {
+			switch ($_REQUEST['geodir_autofill']):
+				case "geodir_dummy_delete" :
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
+						return;
+
+					$datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
+					if (isset($_REQUEST['posttype']))
+						/**
+						 * Used to delete the dummy post data per post type.
+						 *
+						 * Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
+						 *
+						 * @since 1.6.11
+						 * @param string $posttype The post type to insert.
+						 * @param string $datatype The type of dummy data to insert.
+						 */
+						do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
+					break;
+				case "geodir_dummy_insert" :
+					if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
+						return;
+
+					global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
+					$city_bound_lat1 = $_REQUEST['city_bound_lat1'];
+					$city_bound_lng1 = $_REQUEST['city_bound_lng1'];
+					$city_bound_lat2 = $_REQUEST['city_bound_lat2'];
+					$city_bound_lng2 = $_REQUEST['city_bound_lng2'];
+
+					if (isset($_REQUEST['posttype'])){
+						/**
+						 * Used to insert the dummy post data per post type.
+						 *
+						 * Uses dynamic hook, geodir_insert_dummy_posts_$_REQUEST['posttype'].
+						 *
+						 * @since 1.6.11
+						 * @param string $posttype The post type to insert.
+						 * @param string $datatype The type of dummy data to insert.
+						 * @param int $post_index The item number to insert.
+						 */
+						do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
+					}
+
+
+					break;
+			endswitch;
+		} else {
+			wp_redirect(geodir_login_url());
+			exit();
+		}
+	}
+
+	if (isset($_REQUEST['popuptype']) && $_REQUEST['popuptype'] != '' && isset($_REQUEST['post_id']) && $_REQUEST['post_id'] != '') {
+
+		if ($_REQUEST['popuptype'] == 'b_send_inquiry' || $_REQUEST['popuptype'] == 'b_sendtofriend') {
+			$template = locate_template(array("geodirectory/popup-forms.php"));
+			if (!$template) {
+				$template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
+			}
+			require_once($template);
+		}
+
+		gd_die();
+	}
+
+	/*if(isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'filter_ajax'){
         include_once ( geodir_plugin_path() . '/geodirectory-templates/advance-search-form.php');
     }*/
 
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
-        /**
-         * Contains map marker functions.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
-    }
-
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
-        if (is_user_logged_in()) {
-            switch ($_REQUEST['ajax_action']):
-                case "add" :
-                    geodir_add_to_favorite((int)$_REQUEST['pid']);
-                    break;
-                case "remove" :
-                    geodir_remove_from_favorite((int)$_REQUEST['pid']);
-                    break;
-            endswitch;
-        } else {
-            wp_redirect(geodir_login_url());
-            exit();
-        }
-    }
-
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
-
-        $is_current_user_owner = true;
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-            $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
-        }
-
-        $request = $gd_session->get('listing');
-
-        if (is_user_logged_in() && $is_current_user_owner) {
-
-            switch ($_REQUEST['ajax_action']):
-                case "add":
-                case "update":
-
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
-                        $last_id = geodir_save_listing();
-
-                        if ($last_id) {
-                            //$redirect_to = get_permalink( $last_id );
-                            $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
-
-                        } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
-                            $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
-                        } else
-                            $redirect_to = get_permalink(geodir_add_listing_page_id());
-
-                        wp_redirect($redirect_to);
-                    } else {
-                        $gd_session->un_set('listing');
-                        wp_redirect(home_url());
-                    }
-
-                    break;
-                case "cancel" :
-
-                    $gd_session->un_set('listing');
-
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
-                        wp_redirect(get_permalink($_REQUEST['pid']));
-                    else {
-                        geodir_remove_temp_images();
-                        wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
-                    }
-
-                    break;
-
-                case "publish" :
-
-                    if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
-
-                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-                            $new_post = array();
-                            $new_post['ID'] = $_REQUEST['pid'];
-
-                            $lastid = wp_update_post($new_post);
-
-                            $gd_session->un_set('listing');
-                            wp_redirect(get_permalink($lastid));
-                        } else {
-                            $last_id = geodir_save_listing();
-
-                            if ($last_id) {
-                                //$redirect_to = get_permalink( $last_id );
-                                $redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
-                            } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
-                                $redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
-                            } else
-                                $redirect_to = get_permalink(geodir_add_listing_page_id());
-
-                            $gd_session->un_set('listing');
-                            wp_redirect($redirect_to);
-                        }
-                    } else {
-                        $gd_session->un_set('listing');
-                        wp_redirect(home_url());
-                    }
-
-                    break;
-                case "delete" :
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
-                        global $current_user;
-
-                        if (get_option('geodir_disable_perm_delete')) {
-                            $lastid = wp_trash_post($_REQUEST['pid']);
-                        } else {
-                            $lastid = wp_delete_post($_REQUEST['pid']);
-                        }
-
-                        if ($lastid && !is_wp_error($lastid))
-                            wp_redirect($_SERVER['HTTP_REFERER']);
-
-                        //wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
-                    }
-                    break;
-            endswitch;
-
-            $gd_session->un_set('listing');
-        } else {
-            $gd_session->un_set('listing');
-            wp_redirect(geodir_login_url());
-            exit();
-        }
-    }
-
-    if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
-        /**
-         * Contains registration and login functions.
-         * @todo Fix the file path.
-         *
-         * @since 1.0.0
-         * @package GeoDirectory
-         */
-        include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
-    }
-
-    if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
-        $args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
-        if (!empty($_REQUEST['parent_only'])) {
-            $args['parent'] = 0;
-        }
-        $terms_o = get_terms($args);
-
-        // Skip terms which has no listing
-        if (!empty($terms_o)) {
-            $filter_terms = array();
-
-            foreach ($terms_o as $term) {
-                if (isset($term->count) && $term->count > 0) {
-                    $filter_terms[] = $term;
-                }
-            }
-            $terms_o = $filter_terms;
-        }
-
-        $terms = geodir_sort_terms($terms_o, 'count');
-        geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
-        exit();
-    }
-
-    gd_die();
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'map_ajax') {
+		/**
+		 * Contains map marker functions.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
+	}
+
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
+		if (is_user_logged_in()) {
+			switch ($_REQUEST['ajax_action']):
+				case "add" :
+					geodir_add_to_favorite((int)$_REQUEST['pid']);
+					break;
+				case "remove" :
+					geodir_remove_from_favorite((int)$_REQUEST['pid']);
+					break;
+			endswitch;
+		} else {
+			wp_redirect(geodir_login_url());
+			exit();
+		}
+	}
+
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'add_listing') {
+
+		$is_current_user_owner = true;
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+			$is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
+		}
+
+		$request = $gd_session->get('listing');
+
+		if (is_user_logged_in() && $is_current_user_owner) {
+
+			switch ($_REQUEST['ajax_action']):
+				case "add":
+				case "update":
+
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
+						$last_id = geodir_save_listing();
+
+						if ($last_id) {
+							//$redirect_to = get_permalink( $last_id );
+							$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
+
+						} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
+							$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
+						} else
+							$redirect_to = get_permalink(geodir_add_listing_page_id());
+
+						wp_redirect($redirect_to);
+					} else {
+						$gd_session->un_set('listing');
+						wp_redirect(home_url());
+					}
+
+					break;
+				case "cancel" :
+
+					$gd_session->un_set('listing');
+
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
+						wp_redirect(get_permalink($_REQUEST['pid']));
+					else {
+						geodir_remove_temp_images();
+						wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
+					}
+
+					break;
+
+				case "publish" :
+
+					if (isset($request['geodir_spamblocker']) && $request['geodir_spamblocker'] == '64' && isset($request['geodir_filled_by_spam_bot']) && $request['geodir_filled_by_spam_bot'] == '') {
+
+						if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+							$new_post = array();
+							$new_post['ID'] = $_REQUEST['pid'];
+
+							$lastid = wp_update_post($new_post);
+
+							$gd_session->un_set('listing');
+							wp_redirect(get_permalink($lastid));
+						} else {
+							$last_id = geodir_save_listing();
+
+							if ($last_id) {
+								//$redirect_to = get_permalink( $last_id );
+								$redirect_to = geodir_getlink(get_permalink(geodir_success_page_id()), array('pid' => $last_id));
+							} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
+								$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
+							} else
+								$redirect_to = get_permalink(geodir_add_listing_page_id());
+
+							$gd_session->un_set('listing');
+							wp_redirect($redirect_to);
+						}
+					} else {
+						$gd_session->un_set('listing');
+						wp_redirect(home_url());
+					}
+
+					break;
+				case "delete" :
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+						global $current_user;
+
+						if (get_option('geodir_disable_perm_delete')) {
+							$lastid = wp_trash_post($_REQUEST['pid']);
+						} else {
+							$lastid = wp_delete_post($_REQUEST['pid']);
+						}
+
+						if ($lastid && !is_wp_error($lastid))
+							wp_redirect($_SERVER['HTTP_REFERER']);
+
+						//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
+					}
+					break;
+			endswitch;
+
+			$gd_session->un_set('listing');
+		} else {
+			$gd_session->un_set('listing');
+			wp_redirect(geodir_login_url());
+			exit();
+		}
+	}
+
+	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'user_login') {
+		/**
+		 * Contains registration and login functions.
+		 * @todo Fix the file path.
+		 *
+		 * @since 1.0.0
+		 * @package GeoDirectory
+		 */
+		include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
+	}
+
+	if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
+		$args = array('taxonomy' => sanitize_text_field($_REQUEST['term']));
+		if (!empty($_REQUEST['parent_only'])) {
+			$args['parent'] = 0;
+		}
+		$terms_o = get_terms($args);
+
+		// Skip terms which has no listing
+		if (!empty($terms_o)) {
+			$filter_terms = array();
+
+			foreach ($terms_o as $term) {
+				if (isset($term->count) && $term->count > 0) {
+					$filter_terms[] = $term;
+				}
+			}
+			$terms_o = $filter_terms;
+		}
+
+		$terms = geodir_sort_terms($terms_o, 'count');
+		geodir_helper_cat_list_output($terms, intval($_REQUEST['limit']));
+		exit();
+	}
+
+	gd_die();
 }
 
 
 function geodir_show_ga_stats(){
-    if (isset($_REQUEST['ga_start'])) {
-        $ga_start = $_REQUEST['ga_start'];
-    } else {
-        $ga_start = '';
-    }
-    if (isset($_REQUEST['ga_end'])) {
-        $ga_end = $_REQUEST['ga_end'];
-    } else {
-        $ga_end = '';
-    }
-    geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
-    die;
+	if (isset($_REQUEST['ga_start'])) {
+		$ga_start = $_REQUEST['ga_start'];
+	} else {
+		$ga_start = '';
+	}
+	if (isset($_REQUEST['ga_end'])) {
+		$ga_end = $_REQUEST['ga_end'];
+	} else {
+		$ga_end = '';
+	}
+	geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
+	die;
 }
 add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );
 add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
\ No newline at end of file

Please login to merge, or discard this patch.

geodirectory-admin/google-api-php-client/src/Google/Auth/OAuth2.php 3 patches

Doc Comments +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -500,7 +500,7 @@  discard block
 block discarded – undo
    * @param [$issuer] the expected issues, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
    * @throws Google_Auth_Exception
-   * @return mixed token information if valid, false if not
+   * @return Google_Auth_LoginTicket token information if valid, false if not
    */
   public function verifySignedJwtWithCerts(
       $jwt,
@@ -626,6 +626,7 @@  discard block
 block discarded – undo
 
   /**
    * Add a parameter to the auth params if not empty string.
+   * @param string $name
    */
   private function maybeAddParam($params, $name)
   {

Please login to merge, or discard this patch.

Indentation +411 added lines, -411 removed lines patch added patch discarded remove patch

@@ -57,7 +57,7 @@  discard block
 block discarded – undo
    */
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
+	$this->client = $client;
   }
 
   /**
@@ -72,8 +72,8 @@  discard block
 block discarded – undo
    */
   public function authenticatedRequest(Google_Http_Request $request)
   {
-    $request = $this->sign($request);
-    return $this->client->getIo()->makeRequest($request);
+	$request = $this->sign($request);
+	return $this->client->getIo()->makeRequest($request);
   }
 
   /**
@@ -84,52 +84,52 @@  discard block
 block discarded – undo
    */
   public function authenticate($code, $crossClient = false)
   {
-    if (strlen($code) == 0) {
-      throw new Google_Auth_Exception("Invalid code");
-    }
-
-    $arguments = array(
-          'code' => $code,
-          'grant_type' => 'authorization_code',
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret')
-    );
-
-    if ($crossClient !== true) {
-        $arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
-    }
-
-    // We got here from the redirect from a successful authorization grant,
-    // fetch the access token
-    $request = new Google_Http_Request(
-        self::OAUTH2_TOKEN_URI,
-        'POST',
-        array(),
-        $arguments
-    );
-    $request->disableGzip();
-    $response = $this->client->getIo()->makeRequest($request);
-
-    if ($response->getResponseHttpCode() == 200) {
-      $this->setAccessToken($response->getResponseBody());
-      $this->token['created'] = time();
-      return $this->getAccessToken();
-    } else {
-      $decodedResponse = json_decode($response->getResponseBody(), true);
-      if ($decodedResponse != null && $decodedResponse['error']) {
-        $errorText = $decodedResponse['error'];
-        if (isset($decodedResponse['error_description'])) {
-          $errorText .= ": " . $decodedResponse['error_description'];
-        }
-      }
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Error fetching OAuth2 access token, message: '%s'",
-              $errorText
-          ),
-          $response->getResponseHttpCode()
-      );
-    }
+	if (strlen($code) == 0) {
+	  throw new Google_Auth_Exception("Invalid code");
+	}
+
+	$arguments = array(
+		  'code' => $code,
+		  'grant_type' => 'authorization_code',
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret')
+	);
+
+	if ($crossClient !== true) {
+		$arguments['redirect_uri'] = $this->client->getClassConfig($this, 'redirect_uri');
+	}
+
+	// We got here from the redirect from a successful authorization grant,
+	// fetch the access token
+	$request = new Google_Http_Request(
+		self::OAUTH2_TOKEN_URI,
+		'POST',
+		array(),
+		$arguments
+	);
+	$request->disableGzip();
+	$response = $this->client->getIo()->makeRequest($request);
+
+	if ($response->getResponseHttpCode() == 200) {
+	  $this->setAccessToken($response->getResponseBody());
+	  $this->token['created'] = time();
+	  return $this->getAccessToken();
+	} else {
+	  $decodedResponse = json_decode($response->getResponseBody(), true);
+	  if ($decodedResponse != null && $decodedResponse['error']) {
+		$errorText = $decodedResponse['error'];
+		if (isset($decodedResponse['error_description'])) {
+		  $errorText .= ": " . $decodedResponse['error_description'];
+		}
+	  }
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Error fetching OAuth2 access token, message: '%s'",
+			  $errorText
+		  ),
+		  $response->getResponseHttpCode()
+	  );
+	}
   }
 
   /**
@@ -141,37 +141,37 @@  discard block
 block discarded – undo
    */
   public function createAuthUrl($scope)
   {
-    $params = array(
-        'response_type' => 'code',
-        'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
-        'client_id' => $this->client->getClassConfig($this, 'client_id'),
-        'scope' => $scope,
-        'access_type' => $this->client->getClassConfig($this, 'access_type'),
-    );
-
-    // Prefer prompt to approval prompt.
-    if ($this->client->getClassConfig($this, 'prompt')) {
-      $params = $this->maybeAddParam($params, 'prompt');
-    } else {
-      $params = $this->maybeAddParam($params, 'approval_prompt');
-    }
-    $params = $this->maybeAddParam($params, 'login_hint');
-    $params = $this->maybeAddParam($params, 'hd');
-    $params = $this->maybeAddParam($params, 'openid.realm');
-    $params = $this->maybeAddParam($params, 'include_granted_scopes');
-
-    // If the list of scopes contains plus.login, add request_visible_actions
-    // to auth URL.
-    $rva = $this->client->getClassConfig($this, 'request_visible_actions');
-    if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
-        $params['request_visible_actions'] = $rva;
-    }
-
-    if (isset($this->state)) {
-      $params['state'] = $this->state;
-    }
-
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
+	$params = array(
+		'response_type' => 'code',
+		'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
+		'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		'scope' => $scope,
+		'access_type' => $this->client->getClassConfig($this, 'access_type'),
+	);
+
+	// Prefer prompt to approval prompt.
+	if ($this->client->getClassConfig($this, 'prompt')) {
+	  $params = $this->maybeAddParam($params, 'prompt');
+	} else {
+	  $params = $this->maybeAddParam($params, 'approval_prompt');
+	}
+	$params = $this->maybeAddParam($params, 'login_hint');
+	$params = $this->maybeAddParam($params, 'hd');
+	$params = $this->maybeAddParam($params, 'openid.realm');
+	$params = $this->maybeAddParam($params, 'include_granted_scopes');
+
+	// If the list of scopes contains plus.login, add request_visible_actions
+	// to auth URL.
+	$rva = $this->client->getClassConfig($this, 'request_visible_actions');
+	if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
+		$params['request_visible_actions'] = $rva;
+	}
+
+	if (isset($this->state)) {
+	  $params['state'] = $this->state;
+	}
+
+	return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
   }
 
   /**
@@ -180,38 +180,38 @@  discard block
 block discarded – undo
    */
   public function setAccessToken($token)
   {
-    $token = json_decode($token, true);
-    if ($token == null) {
-      throw new Google_Auth_Exception('Could not json decode the token');
-    }
-    if (! isset($token['access_token'])) {
-      throw new Google_Auth_Exception("Invalid token format");
-    }
-    $this->token = $token;
+	$token = json_decode($token, true);
+	if ($token == null) {
+	  throw new Google_Auth_Exception('Could not json decode the token');
+	}
+	if (! isset($token['access_token'])) {
+	  throw new Google_Auth_Exception("Invalid token format");
+	}
+	$this->token = $token;
   }
 
   public function getAccessToken()
   {
-    return json_encode($this->token);
+	return json_encode($this->token);
   }
 
   public function getRefreshToken()
   {
-    if (array_key_exists('refresh_token', $this->token)) {
-      return $this->token['refresh_token'];
-    } else {
-      return null;
-    }
+	if (array_key_exists('refresh_token', $this->token)) {
+	  return $this->token['refresh_token'];
+	} else {
+	  return null;
+	}
   }
 
   public function setState($state)
   {
-    $this->state = $state;
+	$this->state = $state;
   }
 
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
   {
-    $this->assertionCredentials = $creds;
+	$this->assertionCredentials = $creds;
   }
 
   /**
@@ -222,43 +222,43 @@  discard block
 block discarded – undo
    */
   public function sign(Google_Http_Request $request)
   {
-    // add the developer key to the request before signing it
-    if ($this->client->getClassConfig($this, 'developer_key')) {
-      $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
-    }
-
-    // Cannot sign the request without an OAuth access token.
-    if (null == $this->token && null == $this->assertionCredentials) {
-      return $request;
-    }
-
-    // Check if the token is set to expire in the next 30 seconds
-    // (or has already expired).
-    if ($this->isAccessTokenExpired()) {
-      if ($this->assertionCredentials) {
-        $this->refreshTokenWithAssertion();
-      } else {
-        $this->client->getLogger()->debug('OAuth2 access token expired');
-        if (! array_key_exists('refresh_token', $this->token)) {
-          $error = "The OAuth 2.0 access token has expired,"
-                  ." and a refresh token is not available. Refresh tokens"
-                  ." are not returned for responses that were auto-approved.";
-
-          $this->client->getLogger()->error($error);
-          throw new Google_Auth_Exception($error);
-        }
-        $this->refreshToken($this->token['refresh_token']);
-      }
-    }
-
-    $this->client->getLogger()->debug('OAuth2 authentication');
-
-    // Add the OAuth2 header to the request
-    $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
-    );
-
-    return $request;
+	// add the developer key to the request before signing it
+	if ($this->client->getClassConfig($this, 'developer_key')) {
+	  $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
+	}
+
+	// Cannot sign the request without an OAuth access token.
+	if (null == $this->token && null == $this->assertionCredentials) {
+	  return $request;
+	}
+
+	// Check if the token is set to expire in the next 30 seconds
+	// (or has already expired).
+	if ($this->isAccessTokenExpired()) {
+	  if ($this->assertionCredentials) {
+		$this->refreshTokenWithAssertion();
+	  } else {
+		$this->client->getLogger()->debug('OAuth2 access token expired');
+		if (! array_key_exists('refresh_token', $this->token)) {
+		  $error = "The OAuth 2.0 access token has expired,"
+				  ." and a refresh token is not available. Refresh tokens"
+				  ." are not returned for responses that were auto-approved.";
+
+		  $this->client->getLogger()->error($error);
+		  throw new Google_Auth_Exception($error);
+		}
+		$this->refreshToken($this->token['refresh_token']);
+	  }
+	}
+
+	$this->client->getLogger()->debug('OAuth2 authentication');
+
+	// Add the OAuth2 header to the request
+	$request->setRequestHeaders(
+		array('Authorization' => 'Bearer ' . $this->token['access_token'])
+	);
+
+	return $request;
   }
 
   /**
@@ -268,14 +268,14 @@  discard block
 block discarded – undo
    */
   public function refreshToken($refreshToken)
   {
-    $this->refreshTokenRequest(
-        array(
-          'client_id' => $this->client->getClassConfig($this, 'client_id'),
-          'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
-          'refresh_token' => $refreshToken,
-          'grant_type' => 'refresh_token'
-        )
-    );
+	$this->refreshTokenRequest(
+		array(
+		  'client_id' => $this->client->getClassConfig($this, 'client_id'),
+		  'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
+		  'refresh_token' => $refreshToken,
+		  'grant_type' => 'refresh_token'
+		)
+	);
   }
 
   /**
@@ -285,83 +285,83 @@  discard block
 block discarded – undo
    */
   public function refreshTokenWithAssertion($assertionCredentials = null)
   {
-    if (!$assertionCredentials) {
-      $assertionCredentials = $this->assertionCredentials;
-    }
-
-    $cacheKey = $assertionCredentials->getCacheKey();
-
-    if ($cacheKey) {
-      // We can check whether we have a token available in the
-      // cache. If it is expired, we can retrieve a new one from
-      // the assertion.
-      $token = $this->client->getCache()->get($cacheKey);
-      if ($token) {
-        $this->setAccessToken($token);
-      }
-      if (!$this->isAccessTokenExpired()) {
-        return;
-      }
-    }
-
-    $this->client->getLogger()->debug('OAuth2 access token expired');
-    $this->refreshTokenRequest(
-        array(
-          'grant_type' => 'assertion',
-          'assertion_type' => $assertionCredentials->assertionType,
-          'assertion' => $assertionCredentials->generateAssertion(),
-        )
-    );
-
-    if ($cacheKey) {
-      // Attempt to cache the token.
-      $this->client->getCache()->set(
-          $cacheKey,
-          $this->getAccessToken()
-      );
-    }
+	if (!$assertionCredentials) {
+	  $assertionCredentials = $this->assertionCredentials;
+	}
+
+	$cacheKey = $assertionCredentials->getCacheKey();
+
+	if ($cacheKey) {
+	  // We can check whether we have a token available in the
+	  // cache. If it is expired, we can retrieve a new one from
+	  // the assertion.
+	  $token = $this->client->getCache()->get($cacheKey);
+	  if ($token) {
+		$this->setAccessToken($token);
+	  }
+	  if (!$this->isAccessTokenExpired()) {
+		return;
+	  }
+	}
+
+	$this->client->getLogger()->debug('OAuth2 access token expired');
+	$this->refreshTokenRequest(
+		array(
+		  'grant_type' => 'assertion',
+		  'assertion_type' => $assertionCredentials->assertionType,
+		  'assertion' => $assertionCredentials->generateAssertion(),
+		)
+	);
+
+	if ($cacheKey) {
+	  // Attempt to cache the token.
+	  $this->client->getCache()->set(
+		  $cacheKey,
+		  $this->getAccessToken()
+	  );
+	}
   }
 
   private function refreshTokenRequest($params)
   {
-    if (isset($params['assertion'])) {
-      $this->client->getLogger()->info(
-          'OAuth2 access token refresh with Signed JWT assertion grants.'
-      );
-    } else {
-      $this->client->getLogger()->info('OAuth2 access token refresh');
-    }
-
-    $http = new Google_Http_Request(
-        self::OAUTH2_TOKEN_URI,
-        'POST',
-        array(),
-        $params
-    );
-    $http->disableGzip();
-    $request = $this->client->getIo()->makeRequest($http);
-
-    $code = $request->getResponseHttpCode();
-    $body = $request->getResponseBody();
-    if (200 == $code) {
-      $token = json_decode($body, true);
-      if ($token == null) {
-        throw new Google_Auth_Exception("Could not json decode the access token");
-      }
-
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
-        throw new Google_Auth_Exception("Invalid token format");
-      }
-
-      if (isset($token['id_token'])) {
-        $this->token['id_token'] = $token['id_token'];
-      }
-      $this->token['access_token'] = $token['access_token'];
-      $this->token['expires_in'] = $token['expires_in'];
-      $this->token['created'] = time();
-    } else {
-      throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
-    }
+	if (isset($params['assertion'])) {
+	  $this->client->getLogger()->info(
+		  'OAuth2 access token refresh with Signed JWT assertion grants.'
+	  );
+	} else {
+	  $this->client->getLogger()->info('OAuth2 access token refresh');
+	}
+
+	$http = new Google_Http_Request(
+		self::OAUTH2_TOKEN_URI,
+		'POST',
+		array(),
+		$params
+	);
+	$http->disableGzip();
+	$request = $this->client->getIo()->makeRequest($http);
+
+	$code = $request->getResponseHttpCode();
+	$body = $request->getResponseBody();
+	if (200 == $code) {
+	  $token = json_decode($body, true);
+	  if ($token == null) {
+		throw new Google_Auth_Exception("Could not json decode the access token");
+	  }
+
+	  if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+		throw new Google_Auth_Exception("Invalid token format");
+	  }
+
+	  if (isset($token['id_token'])) {
+		$this->token['id_token'] = $token['id_token'];
+	  }
+	  $this->token['access_token'] = $token['access_token'];
+	  $this->token['expires_in'] = $token['expires_in'];
+	  $this->token['created'] = time();
+	} else {
+	  throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
+	}
   }
 
   /**
@@ -373,31 +373,31 @@  discard block
 block discarded – undo
    */
   public function revokeToken($token = null)
   {
-    if (!$token) {
-      if (!$this->token) {
-        // Not initialized, no token to actually revoke
-        return false;
-      } elseif (array_key_exists('refresh_token', $this->token)) {
-        $token = $this->token['refresh_token'];
-      } else {
-        $token = $this->token['access_token'];
-      }
-    }
-    $request = new Google_Http_Request(
-        self::OAUTH2_REVOKE_URI,
-        'POST',
-        array(),
-        "token=$token"
-    );
-    $request->disableGzip();
-    $response = $this->client->getIo()->makeRequest($request);
-    $code = $response->getResponseHttpCode();
-    if ($code == 200) {
-      $this->token = null;
-      return true;
-    }
-
-    return false;
+	if (!$token) {
+	  if (!$this->token) {
+		// Not initialized, no token to actually revoke
+		return false;
+	  } elseif (array_key_exists('refresh_token', $this->token)) {
+		$token = $this->token['refresh_token'];
+	  } else {
+		$token = $this->token['access_token'];
+	  }
+	}
+	$request = new Google_Http_Request(
+		self::OAUTH2_REVOKE_URI,
+		'POST',
+		array(),
+		"token=$token"
+	);
+	$request->disableGzip();
+	$response = $this->client->getIo()->makeRequest($request);
+	$code = $response->getResponseHttpCode();
+	if ($code == 200) {
+	  $this->token = null;
+	  return true;
+	}
+
+	return false;
   }
 
   /**
@@ -406,15 +406,15 @@  discard block
 block discarded – undo
    */
   public function isAccessTokenExpired()
   {
-    if (!$this->token || !isset($this->token['created'])) {
-      return true;
-    }
+	if (!$this->token || !isset($this->token['created'])) {
+	  return true;
+	}
 
-    // If the token is set to expire in the next 30 seconds.
-    $expired = ($this->token['created']
-        + ($this->token['expires_in'] - 30)) < time();
+	// If the token is set to expire in the next 30 seconds.
+	$expired = ($this->token['created']
+		+ ($this->token['expires_in'] - 30)) < time();
 
-    return $expired;
+	return $expired;
   }
 
   // Gets federated sign-on certificates to use for verifying identity tokens.
@@ -422,9 +422,9 @@  discard block
 block discarded – undo
   // are PEM encoded certificates.
   private function getFederatedSignOnCerts()
   {
-    return $this->retrieveCertsFromLocation(
-        $this->client->getClassConfig($this, 'federated_signon_certs_url')
-    );
+	return $this->retrieveCertsFromLocation(
+		$this->client->getClassConfig($this, 'federated_signon_certs_url')
+	);
   }
 
   /**
@@ -436,36 +436,36 @@  discard block
 block discarded – undo
    */
   public function retrieveCertsFromLocation($url)
   {
-    // If we're retrieving a local file, just grab it.
-    if ("http" != substr($url, 0, 4)) {
-      $file = file_get_contents($url);
-      if ($file) {
-        return json_decode($file, true);
-      } else {
-        throw new Google_Auth_Exception(
-            "Failed to retrieve verification certificates: '" .
-            $url . "'."
-        );
-      }
-    }
-
-    // This relies on makeRequest caching certificate responses.
-    $request = $this->client->getIo()->makeRequest(
-        new Google_Http_Request(
-            $url
-        )
-    );
-    if ($request->getResponseHttpCode() == 200) {
-      $certs = json_decode($request->getResponseBody(), true);
-      if ($certs) {
-        return $certs;
-      }
-    }
-    throw new Google_Auth_Exception(
-        "Failed to retrieve verification certificates: '" .
-        $request->getResponseBody() . "'.",
-        $request->getResponseHttpCode()
-    );
+	// If we're retrieving a local file, just grab it.
+	if ("http" != substr($url, 0, 4)) {
+	  $file = file_get_contents($url);
+	  if ($file) {
+		return json_decode($file, true);
+	  } else {
+		throw new Google_Auth_Exception(
+			"Failed to retrieve verification certificates: '" .
+			$url . "'."
+		);
+	  }
+	}
+
+	// This relies on makeRequest caching certificate responses.
+	$request = $this->client->getIo()->makeRequest(
+		new Google_Http_Request(
+			$url
+		)
+	);
+	if ($request->getResponseHttpCode() == 200) {
+	  $certs = json_decode($request->getResponseBody(), true);
+	  if ($certs) {
+		return $certs;
+	  }
+	}
+	throw new Google_Auth_Exception(
+		"Failed to retrieve verification certificates: '" .
+		$request->getResponseBody() . "'.",
+		$request->getResponseHttpCode()
+	);
   }
 
   /**
@@ -480,15 +480,15 @@  discard block
 block discarded – undo
    */
   public function verifyIdToken($id_token = null, $audience = null)
   {
-    if (!$id_token) {
-      $id_token = $this->token['id_token'];
-    }
-    $certs = $this->getFederatedSignonCerts();
-    if (!$audience) {
-      $audience = $this->client->getClassConfig($this, 'client_id');
-    }
-
-    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
+	if (!$id_token) {
+	  $id_token = $this->token['id_token'];
+	}
+	$certs = $this->getFederatedSignonCerts();
+	if (!$audience) {
+	  $audience = $this->client->getClassConfig($this, 'client_id');
+	}
+
+	return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
   }
 
   /**
@@ -503,125 +503,125 @@  discard block
 block discarded – undo
    * @return mixed token information if valid, false if not
    */
   public function verifySignedJwtWithCerts(
-      $jwt,
-      $certs,
-      $required_audience,
-      $issuer = null,
-      $max_expiry = null
+	  $jwt,
+	  $certs,
+	  $required_audience,
+	  $issuer = null,
+	  $max_expiry = null
   ) {
-    if (!$max_expiry) {
-      // Set the maximum time we will accept a token for.
-      $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
-    }
-
-    $segments = explode(".", $jwt);
-    if (count($segments) != 3) {
-      throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
-    }
-    $signed = $segments[0] . "." . $segments[1];
-    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
-
-    // Parse envelope.
-    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
-    if (!$envelope) {
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
-    }
-
-    // Parse token
-    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
-    $payload = json_decode($json_body, true);
-    if (!$payload) {
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
-    }
-
-    // Check signature
-    $verified = false;
-    foreach ($certs as $keyName => $pem) {
-      $public_key = new Google_Verifier_Pem($pem);
-      if ($public_key->verify($signed, $signature)) {
-        $verified = true;
-        break;
-      }
-    }
-
-    if (!$verified) {
-      throw new Google_Auth_Exception("Invalid token signature: $jwt");
-    }
-
-    // Check issued-at timestamp
-    $iat = 0;
-    if (array_key_exists("iat", $payload)) {
-      $iat = $payload["iat"];
-    }
-    if (!$iat) {
-      throw new Google_Auth_Exception("No issue time in token: $json_body");
-    }
-    $earliest = $iat - self::CLOCK_SKEW_SECS;
-
-    // Check expiration timestamp
-    $now = time();
-    $exp = 0;
-    if (array_key_exists("exp", $payload)) {
-      $exp = $payload["exp"];
-    }
-    if (!$exp) {
-      throw new Google_Auth_Exception("No expiration time in token: $json_body");
-    }
-    if ($exp >= $now + $max_expiry) {
-      throw new Google_Auth_Exception(
-          sprintf("Expiration time too far in future: %s", $json_body)
-      );
-    }
-
-    $latest = $exp + self::CLOCK_SKEW_SECS;
-    if ($now < $earliest) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Token used too early, %s < %s: %s",
-              $now,
-              $earliest,
-              $json_body
-          )
-      );
-    }
-    if ($now > $latest) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Token used too late, %s > %s: %s",
-              $now,
-              $latest,
-              $json_body
-          )
-      );
-    }
-
-    $iss = $payload['iss'];
-    if ($issuer && $iss != $issuer) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Invalid issuer, %s != %s: %s",
-              $iss,
-              $issuer,
-              $json_body
-          )
-      );
-    }
-
-    // Check audience
-    $aud = $payload["aud"];
-    if ($aud != $required_audience) {
-      throw new Google_Auth_Exception(
-          sprintf(
-              "Wrong recipient, %s != %s:",
-              $aud,
-              $required_audience,
-              $json_body
-          )
-      );
-    }
-
-    // All good.
-    return new Google_Auth_LoginTicket($envelope, $payload);
+	if (!$max_expiry) {
+	  // Set the maximum time we will accept a token for.
+	  $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
+	}
+
+	$segments = explode(".", $jwt);
+	if (count($segments) != 3) {
+	  throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
+	}
+	$signed = $segments[0] . "." . $segments[1];
+	$signature = Google_Utils::urlSafeB64Decode($segments[2]);
+
+	// Parse envelope.
+	$envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
+	if (!$envelope) {
+	  throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
+	}
+
+	// Parse token
+	$json_body = Google_Utils::urlSafeB64Decode($segments[1]);
+	$payload = json_decode($json_body, true);
+	if (!$payload) {
+	  throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
+	}
+
+	// Check signature
+	$verified = false;
+	foreach ($certs as $keyName => $pem) {
+	  $public_key = new Google_Verifier_Pem($pem);
+	  if ($public_key->verify($signed, $signature)) {
+		$verified = true;
+		break;
+	  }
+	}
+
+	if (!$verified) {
+	  throw new Google_Auth_Exception("Invalid token signature: $jwt");
+	}
+
+	// Check issued-at timestamp
+	$iat = 0;
+	if (array_key_exists("iat", $payload)) {
+	  $iat = $payload["iat"];
+	}
+	if (!$iat) {
+	  throw new Google_Auth_Exception("No issue time in token: $json_body");
+	}
+	$earliest = $iat - self::CLOCK_SKEW_SECS;
+
+	// Check expiration timestamp
+	$now = time();
+	$exp = 0;
+	if (array_key_exists("exp", $payload)) {
+	  $exp = $payload["exp"];
+	}
+	if (!$exp) {
+	  throw new Google_Auth_Exception("No expiration time in token: $json_body");
+	}
+	if ($exp >= $now + $max_expiry) {
+	  throw new Google_Auth_Exception(
+		  sprintf("Expiration time too far in future: %s", $json_body)
+	  );
+	}
+
+	$latest = $exp + self::CLOCK_SKEW_SECS;
+	if ($now < $earliest) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Token used too early, %s < %s: %s",
+			  $now,
+			  $earliest,
+			  $json_body
+		  )
+	  );
+	}
+	if ($now > $latest) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Token used too late, %s > %s: %s",
+			  $now,
+			  $latest,
+			  $json_body
+		  )
+	  );
+	}
+
+	$iss = $payload['iss'];
+	if ($issuer && $iss != $issuer) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Invalid issuer, %s != %s: %s",
+			  $iss,
+			  $issuer,
+			  $json_body
+		  )
+	  );
+	}
+
+	// Check audience
+	$aud = $payload["aud"];
+	if ($aud != $required_audience) {
+	  throw new Google_Auth_Exception(
+		  sprintf(
+			  "Wrong recipient, %s != %s:",
+			  $aud,
+			  $required_audience,
+			  $json_body
+		  )
+	  );
+	}
+
+	// All good.
+	return new Google_Auth_LoginTicket($envelope, $payload);
   }
 
   /**
@@ -629,10 +629,10 @@  discard block
 block discarded – undo
    */
   private function maybeAddParam($params, $name)
   {
-    $param = $this->client->getClassConfig($this, $name);
-    if ($param != '') {
-      $params[$name] = $param;
-    }
-    return $params;
+	$param = $this->client->getClassConfig($this, $name);
+	if ($param != '') {
+	  $params[$name] = $param;
+	}
+	return $params;
   }
 }

Please login to merge, or discard this patch.

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
       if ($decodedResponse != null && $decodedResponse['error']) {
         $errorText = $decodedResponse['error'];
         if (isset($decodedResponse['error_description'])) {
-          $errorText .= ": " . $decodedResponse['error_description'];
+          $errorText .= ": ".$decodedResponse['error_description'];
         }
       }
       throw new Google_Auth_Exception(
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
       $params['state'] = $this->state;
     }
 
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
+    return self::OAUTH2_AUTH_URL."?".http_build_query($params, '', '&');
   }
 
   /**
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
     if ($token == null) {
       throw new Google_Auth_Exception('Could not json decode the token');
     }
-    if (! isset($token['access_token'])) {
+    if (!isset($token['access_token'])) {
       throw new Google_Auth_Exception("Invalid token format");
     }
     $this->token = $token;
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
         $this->refreshTokenWithAssertion();
       } else {
         $this->client->getLogger()->debug('OAuth2 access token expired');
-        if (! array_key_exists('refresh_token', $this->token)) {
+        if (!array_key_exists('refresh_token', $this->token)) {
           $error = "The OAuth 2.0 access token has expired,"
                   ." and a refresh token is not available. Refresh tokens"
                   ." are not returned for responses that were auto-approved.";
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
 
     // Add the OAuth2 header to the request
     $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+        array('Authorization' => 'Bearer '.$this->token['access_token'])
     );
 
     return $request;
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
         throw new Google_Auth_Exception("Could not json decode the access token");
       }
 
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+      if (!isset($token['access_token']) || !isset($token['expires_in'])) {
         throw new Google_Auth_Exception("Invalid token format");
       }
 
@@ -443,8 +443,8 @@  discard block
 block discarded – undo
         return json_decode($file, true);
       } else {
         throw new Google_Auth_Exception(
-            "Failed to retrieve verification certificates: '" .
-            $url . "'."
+            "Failed to retrieve verification certificates: '".
+            $url."'."
         );
       }
     }
@@ -462,8 +462,8 @@  discard block
 block discarded – undo
       }
     }
     throw new Google_Auth_Exception(
-        "Failed to retrieve verification certificates: '" .
-        $request->getResponseBody() . "'.",
+        "Failed to retrieve verification certificates: '".
+        $request->getResponseBody()."'.",
         $request->getResponseHttpCode()
     );
   }
@@ -518,20 +518,20 @@  discard block
 block discarded – undo
     if (count($segments) != 3) {
       throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
     }
-    $signed = $segments[0] . "." . $segments[1];
+    $signed = $segments[0].".".$segments[1];
     $signature = Google_Utils::urlSafeB64Decode($segments[2]);
 
     // Parse envelope.
     $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
     if (!$envelope) {
-      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
+      throw new Google_Auth_Exception("Can't parse token envelope: ".$segments[0]);
     }
 
     // Parse token
     $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
     $payload = json_decode($json_body, true);
     if (!$payload) {
-      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
+      throw new Google_Auth_Exception("Can't parse token payload: ".$segments[1]);
     }
 
     // Check signature

Please login to merge, or discard this patch.

geodirectory-admin/google-api-php-client/src/Google/Cache/File.php 3 patches

Doc Comments +18 added lines patch added patch discarded remove patch

@@ -129,6 +129,9 @@  discard block
 block discarded – undo
     );
   }
 
+  /**
+   * @param string $file
+   */
   private function getWriteableCacheFile($file)
   {
     return $this->getCacheFile($file, true);
@@ -139,6 +142,9 @@  discard block
 block discarded – undo
     return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
   }
 
+  /**
+   * @param boolean $forWrite
+   */
   private function getCacheDir($file, $forWrite)
   {
     // use the first 2 characters of the hash as a directory prefix
@@ -157,11 +163,17 @@  discard block
 block discarded – undo
     return $storageDir;
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function acquireReadLock($storageFile)
   {
     return $this->acquireLock(LOCK_SH, $storageFile);
   }
 
+  /**
+   * @param string $storageFile
+   */
   private function acquireWriteLock($storageFile)
   {
     $rc = $this->acquireLock(LOCK_EX, $storageFile);
@@ -175,6 +187,9 @@  discard block
 block discarded – undo
     return $rc;
   }
 
+  /**
+   * @param integer $type
+   */
   private function acquireLock($type, $storageFile)
   {
     $mode = $type == LOCK_EX ? "w" : "r";
@@ -197,6 +212,9 @@  discard block
 block discarded – undo
     return true;
   }
 
+  /**
+   * @param string $storageFile
+   */
   public function unlock($storageFile)
   {
     if ($this->fh) {

Please login to merge, or discard this patch.

Indentation +122 added lines, -122 removed lines patch added patch discarded remove patch

@@ -40,167 +40,167 @@
 block discarded – undo
 
   public function __construct(Google_Client $client)
   {
-    $this->client = $client;
-    $this->path = $this->client->getClassConfig($this, 'directory');
+	$this->client = $client;
+	$this->path = $this->client->getClassConfig($this, 'directory');
   }
 
   public function get($key, $expiration = false)
   {
-    $storageFile = $this->getCacheFile($key);
-    $data = false;
-
-    if (!file_exists($storageFile)) {
-      $this->client->getLogger()->debug(
-          'File cache miss',
-          array('key' => $key, 'file' => $storageFile)
-      );
-      return false;
-    }
-
-    if ($expiration) {
-      $mtime = filemtime($storageFile);
-      if ((time() - $mtime) >= $expiration) {
-        $this->client->getLogger()->debug(
-            'File cache miss (expired)',
-            array('key' => $key, 'file' => $storageFile)
-        );
-        $this->delete($key);
-        return false;
-      }
-    }
-
-    if ($this->acquireReadLock($storageFile)) {
-      if (filesize($storageFile) > 0) {
-        $data = fread($this->fh, filesize($storageFile));
-        $data =  unserialize($data);
-      } else {
-        $this->client->getLogger()->debug(
-            'Cache file was empty',
-            array('file' => $storageFile)
-        );
-      }
-      $this->unlock($storageFile);
-    }
-
-    $this->client->getLogger()->debug(
-        'File cache hit',
-        array('key' => $key, 'file' => $storageFile, 'var' => $data)
-    );
-
-    return $data;
+	$storageFile = $this->getCacheFile($key);
+	$data = false;
+
+	if (!file_exists($storageFile)) {
+	  $this->client->getLogger()->debug(
+		  'File cache miss',
+		  array('key' => $key, 'file' => $storageFile)
+	  );
+	  return false;
+	}
+
+	if ($expiration) {
+	  $mtime = filemtime($storageFile);
+	  if ((time() - $mtime) >= $expiration) {
+		$this->client->getLogger()->debug(
+			'File cache miss (expired)',
+			array('key' => $key, 'file' => $storageFile)
+		);
+		$this->delete($key);
+		return false;
+	  }
+	}
+
+	if ($this->acquireReadLock($storageFile)) {
+	  if (filesize($storageFile) > 0) {
+		$data = fread($this->fh, filesize($storageFile));
+		$data =  unserialize($data);
+	  } else {
+		$this->client->getLogger()->debug(
+			'Cache file was empty',
+			array('file' => $storageFile)
+		);
+	  }
+	  $this->unlock($storageFile);
+	}
+
+	$this->client->getLogger()->debug(
+		'File cache hit',
+		array('key' => $key, 'file' => $storageFile, 'var' => $data)
+	);
+
+	return $data;
   }
 
   public function set($key, $value)
   {
-    $storageFile = $this->getWriteableCacheFile($key);
-    if ($this->acquireWriteLock($storageFile)) {
-      // We serialize the whole request object, since we don't only want the
-      // responseContent but also the postBody used, headers, size, etc.
-      $data = serialize($value);
-      $result = fwrite($this->fh, $data);
-      $this->unlock($storageFile);
-
-      $this->client->getLogger()->debug(
-          'File cache set',
-          array('key' => $key, 'file' => $storageFile, 'var' => $value)
-      );
-    } else {
-      $this->client->getLogger()->notice(
-          'File cache set failed',
-          array('key' => $key, 'file' => $storageFile)
-      );
-    }
+	$storageFile = $this->getWriteableCacheFile($key);
+	if ($this->acquireWriteLock($storageFile)) {
+	  // We serialize the whole request object, since we don't only want the
+	  // responseContent but also the postBody used, headers, size, etc.
+	  $data = serialize($value);
+	  $result = fwrite($this->fh, $data);
+	  $this->unlock($storageFile);
+
+	  $this->client->getLogger()->debug(
+		  'File cache set',
+		  array('key' => $key, 'file' => $storageFile, 'var' => $value)
+	  );
+	} else {
+	  $this->client->getLogger()->notice(
+		  'File cache set failed',
+		  array('key' => $key, 'file' => $storageFile)
+	  );
+	}
   }
 
   public function delete($key)
   {
-    $file = $this->getCacheFile($key);
-    if (file_exists($file) && !unlink($file)) {
-      $this->client->getLogger()->error(
-          'File cache delete failed',
-          array('key' => $key, 'file' => $file)
-      );
-      throw new Google_Cache_Exception("Cache file could not be deleted");
-    }
-
-    $this->client->getLogger()->debug(
-        'File cache delete',
-        array('key' => $key, 'file' => $file)
-    );
+	$file = $this->getCacheFile($key);
+	if (file_exists($file) && !unlink($file)) {
+	  $this->client->getLogger()->error(
+		  'File cache delete failed',
+		  array('key' => $key, 'file' => $file)
+	  );
+	  throw new Google_Cache_Exception("Cache file could not be deleted");
+	}
+
+	$this->client->getLogger()->debug(
+		'File cache delete',
+		array('key' => $key, 'file' => $file)
+	);
   }
 
   private function getWriteableCacheFile($file)
   {
-    return $this->getCacheFile($file, true);
+	return $this->getCacheFile($file, true);
   }
 
   private function getCacheFile($file, $forWrite = false)
   {
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
+	return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
   }
 
   private function getCacheDir($file, $forWrite)
   {
-    // use the first 2 characters of the hash as a directory prefix
-    // this should prevent slowdowns due to huge directory listings
-    // and thus give some basic amount of scalability
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
-    if ($forWrite && ! is_dir($storageDir)) {
-      if (! mkdir($storageDir, 0755, true)) {
-        $this->client->getLogger()->error(
-            'File cache creation failed',
-            array('dir' => $storageDir)
-        );
-        throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
-      }
-    }
-    return $storageDir;
+	// use the first 2 characters of the hash as a directory prefix
+	// this should prevent slowdowns due to huge directory listings
+	// and thus give some basic amount of scalability
+	$storageDir = $this->path . '/' . substr(md5($file), 0, 2);
+	if ($forWrite && ! is_dir($storageDir)) {
+	  if (! mkdir($storageDir, 0755, true)) {
+		$this->client->getLogger()->error(
+			'File cache creation failed',
+			array('dir' => $storageDir)
+		);
+		throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
+	  }
+	}
+	return $storageDir;
   }
 
   private function acquireReadLock($storageFile)
   {
-    return $this->acquireLock(LOCK_SH, $storageFile);
+	return $this->acquireLock(LOCK_SH, $storageFile);
   }
 
   private function acquireWriteLock($storageFile)
   {
-    $rc = $this->acquireLock(LOCK_EX, $storageFile);
-    if (!$rc) {
-      $this->client->getLogger()->notice(
-          'File cache write lock failed',
-          array('file' => $storageFile)
-      );
-      $this->delete($storageFile);
-    }
-    return $rc;
+	$rc = $this->acquireLock(LOCK_EX, $storageFile);
+	if (!$rc) {
+	  $this->client->getLogger()->notice(
+		  'File cache write lock failed',
+		  array('file' => $storageFile)
+	  );
+	  $this->delete($storageFile);
+	}
+	return $rc;
   }
 
   private function acquireLock($type, $storageFile)
   {
-    $mode = $type == LOCK_EX ? "w" : "r";
-    $this->fh = fopen($storageFile, $mode);
-    if (!$this->fh) {
-      $this->client->getLogger()->error(
-          'Failed to open file during lock acquisition',
-          array('file' => $storageFile)
-      );
-      return false;
-    }
-    $count = 0;
-    while (!flock($this->fh, $type | LOCK_NB)) {
-      // Sleep for 10ms.
-      usleep(10000);
-      if (++$count < self::MAX_LOCK_RETRIES) {
-        return false;
-      }
-    }
-    return true;
+	$mode = $type == LOCK_EX ? "w" : "r";
+	$this->fh = fopen($storageFile, $mode);
+	if (!$this->fh) {
+	  $this->client->getLogger()->error(
+		  'Failed to open file during lock acquisition',
+		  array('file' => $storageFile)
+	  );
+	  return false;
+	}
+	$count = 0;
+	while (!flock($this->fh, $type | LOCK_NB)) {
+	  // Sleep for 10ms.
+	  usleep(10000);
+	  if (++$count < self::MAX_LOCK_RETRIES) {
+		return false;
+	  }
+	}
+	return true;
   }
 
   public function unlock($storageFile)
   {
-    if ($this->fh) {
-      flock($this->fh, LOCK_UN);
-    }
+	if ($this->fh) {
+	  flock($this->fh, LOCK_UN);
+	}
   }
 }

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /*
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
     if ($this->acquireReadLock($storageFile)) {
       if (filesize($storageFile) > 0) {
         $data = fread($this->fh, filesize($storageFile));
-        $data =  unserialize($data);
+        $data = unserialize($data);
       } else {
         $this->client->getLogger()->debug(
             'Cache file was empty',
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
 
   private function getCacheFile($file, $forWrite = false)
   {
-    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
+    return $this->getCacheDir($file, $forWrite).'/'.md5($file);
   }
 
   private function getCacheDir($file, $forWrite)
@@ -144,9 +144,9 @@  discard block
 block discarded – undo
     // use the first 2 characters of the hash as a directory prefix
     // this should prevent slowdowns due to huge directory listings
     // and thus give some basic amount of scalability
-    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
-    if ($forWrite && ! is_dir($storageDir)) {
-      if (! mkdir($storageDir, 0755, true)) {
+    $storageDir = $this->path.'/'.substr(md5($file), 0, 2);
+    if ($forWrite && !is_dir($storageDir)) {
+      if (!mkdir($storageDir, 0755, true)) {
         $this->client->getLogger()->error(
             'File cache creation failed',
             array('dir' => $storageDir)

Please login to merge, or discard this patch.

geodirectory-admin/google-api-php-client/src/Google/Client.php 3 patches

Doc Comments +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -191,7 +191,7 @@  discard block
 block discarded – undo
 
   /**
    * @throws Google_Auth_Exception
-   * @return array
+   * @return string
    * @visible For Testing
    */
   public function prepareScopes()
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
    * @param $audience string the expected consumer of the token
    * @param $issuer string the expected issuer, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
-   * @return mixed token information if valid, false if not
+   * @return Google_Auth_LoginTicket token information if valid, false if not
    */
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
   {
@@ -512,6 +512,7 @@  discard block
 block discarded – undo
    * Will remove any previously configured scopes.
    * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.login',
    * 'https://www.googleapis.com/auth/moderator')
+   * @param string[] $scopes
    */
   public function setScopes($scopes)
   {

Please login to merge, or discard this patch.

Indentation +160 added lines, -160 removed lines patch added patch discarded remove patch

@@ -74,32 +74,32 @@  discard block
 block discarded – undo
    */
   public function __construct($config = null)
   {
-    if (is_string($config) && strlen($config)) {
-      $config = new Google_Config($config);
-    } else if ( !($config instanceof Google_Config)) {
-      $config = new Google_Config();
+	if (is_string($config) && strlen($config)) {
+	  $config = new Google_Config($config);
+	} else if ( !($config instanceof Google_Config)) {
+	  $config = new Google_Config();
 
-      if ($this->isAppEngine()) {
-        // Automatically use Memcache if we're in AppEngine.
-        $config->setCacheClass('Google_Cache_Memcache');
-      }
+	  if ($this->isAppEngine()) {
+		// Automatically use Memcache if we're in AppEngine.
+		$config->setCacheClass('Google_Cache_Memcache');
+	  }
 
-      if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
-        // Automatically disable compress.zlib, as currently unsupported.
-        $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
-      }
-    }
+	  if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
+		// Automatically disable compress.zlib, as currently unsupported.
+		$config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
+	  }
+	}
 
-    if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
-      if (function_exists('curl_version') && function_exists('curl_exec')
-          && !$this->isAppEngine()) {
-        $config->setIoClass("Google_IO_Curl");
-      } else {
-        $config->setIoClass("Google_IO_Stream");
-      }
-    }
+	if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
+	  if (function_exists('curl_version') && function_exists('curl_exec')
+		  && !$this->isAppEngine()) {
+		$config->setIoClass("Google_IO_Curl");
+	  } else {
+		$config->setIoClass("Google_IO_Stream");
+	  }
+	}
 
-    $this->config = $config;
+	$this->config = $config;
   }
 
   /**
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
    */
   public function getLibraryVersion()
   {
-    return self::LIBVER;
+	return self::LIBVER;
   }
 
   /**
@@ -124,8 +124,8 @@  discard block
 block discarded – undo
    */
   public function authenticate($code, $crossClient = false)
   {
-    $this->authenticated = true;
-    return $this->getAuth()->authenticate($code, $crossClient);
+	$this->authenticated = true;
+	return $this->getAuth()->authenticate($code, $crossClient);
   }
   
   /**
@@ -141,18 +141,18 @@  discard block
 block discarded – undo
    */
   public function loadServiceAccountJson($jsonLocation, $scopes)
   {
-    $data = json_decode(file_get_contents($jsonLocation));
-    if (isset($data->type) && $data->type == 'service_account') {
-      // Service Account format.
-      $cred = new Google_Auth_AssertionCredentials(
-          $data->client_email,
-          $scopes,
-          $data->private_key
-      );
-      return $cred;
-    } else {
-      throw new Google_Exception("Invalid service account JSON file.");
-    }
+	$data = json_decode(file_get_contents($jsonLocation));
+	if (isset($data->type) && $data->type == 'service_account') {
+	  // Service Account format.
+	  $cred = new Google_Auth_AssertionCredentials(
+		  $data->client_email,
+		  $scopes,
+		  $data->private_key
+	  );
+	  return $cred;
+	} else {
+	  throw new Google_Exception("Invalid service account JSON file.");
+	}
   }
 
   /**
@@ -165,16 +165,16 @@  discard block
 block discarded – undo
    */
   public function setAuthConfig($json)
   {
-    $data = json_decode($json);
-    $key = isset($data->installed) ? 'installed' : 'web';
-    if (!isset($data->$key)) {
-      throw new Google_Exception("Invalid client secret JSON file.");
-    }
-    $this->setClientId($data->$key->client_id);
-    $this->setClientSecret($data->$key->client_secret);
-    if (isset($data->$key->redirect_uris)) {
-      $this->setRedirectUri($data->$key->redirect_uris[0]);
-    }
+	$data = json_decode($json);
+	$key = isset($data->installed) ? 'installed' : 'web';
+	if (!isset($data->$key)) {
+	  throw new Google_Exception("Invalid client secret JSON file.");
+	}
+	$this->setClientId($data->$key->client_id);
+	$this->setClientSecret($data->$key->client_secret);
+	if (isset($data->$key->redirect_uris)) {
+	  $this->setRedirectUri($data->$key->redirect_uris[0]);
+	}
   }
 
   /**
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
    */
   public function setAuthConfigFile($file)
   {
-    $this->setAuthConfig(file_get_contents($file));
+	$this->setAuthConfig(file_get_contents($file));
   }
 
   /**
@@ -196,11 +196,11 @@  discard block
 block discarded – undo
    */
   public function prepareScopes()
   {
-    if (empty($this->requestedScopes)) {
-      throw new Google_Auth_Exception("No scopes specified");
-    }
-    $scopes = implode(' ', $this->requestedScopes);
-    return $scopes;
+	if (empty($this->requestedScopes)) {
+	  throw new Google_Auth_Exception("No scopes specified");
+	}
+	$scopes = implode(' ', $this->requestedScopes);
+	return $scopes;
   }
 
   /**
@@ -212,10 +212,10 @@  discard block
 block discarded – undo
    */
   public function setAccessToken($accessToken)
   {
-    if ($accessToken == 'null') {
-      $accessToken = null;
-    }
-    $this->getAuth()->setAccessToken($accessToken);
+	if ($accessToken == 'null') {
+	  $accessToken = null;
+	}
+	$this->getAuth()->setAccessToken($accessToken);
   }
 
 
@@ -226,8 +226,8 @@  discard block
 block discarded – undo
    */
   public function setAuth(Google_Auth_Abstract $auth)
   {
-    $this->config->setAuthClass(get_class($auth));
-    $this->auth = $auth;
+	$this->config->setAuthClass(get_class($auth));
+	$this->auth = $auth;
   }
 
   /**
@@ -236,8 +236,8 @@  discard block
 block discarded – undo
    */
   public function setIo(Google_IO_Abstract $io)
   {
-    $this->config->setIoClass(get_class($io));
-    $this->io = $io;
+	$this->config->setIoClass(get_class($io));
+	$this->io = $io;
   }
 
   /**
@@ -246,8 +246,8 @@  discard block
 block discarded – undo
    */
   public function setCache(Google_Cache_Abstract $cache)
   {
-    $this->config->setCacheClass(get_class($cache));
-    $this->cache = $cache;
+	$this->config->setCacheClass(get_class($cache));
+	$this->cache = $cache;
   }
 
   /**
@@ -256,8 +256,8 @@  discard block
 block discarded – undo
    */
   public function setLogger(Google_Logger_Abstract $logger)
   {
-    $this->config->setLoggerClass(get_class($logger));
-    $this->logger = $logger;
+	$this->config->setLoggerClass(get_class($logger));
+	$this->logger = $logger;
   }
 
   /**
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
    */
   public function createAuthUrl()
   {
-    $scopes = $this->prepareScopes();
-    return $this->getAuth()->createAuthUrl($scopes);
+	$scopes = $this->prepareScopes();
+	return $this->getAuth()->createAuthUrl($scopes);
   }
 
   /**
@@ -278,11 +278,11 @@  discard block
 block discarded – undo
    */
   public function getAccessToken()
   {
-    $token = $this->getAuth()->getAccessToken();
-    // The response is json encoded, so could be the string null.
-    // It is arguable whether this check should be here or lower
-    // in the library.
-    return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
+	$token = $this->getAuth()->getAccessToken();
+	// The response is json encoded, so could be the string null.
+	// It is arguable whether this check should be here or lower
+	// in the library.
+	return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
   }
 
   /**
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
    */
   public function getRefreshToken()
   {
-    return $this->getAuth()->getRefreshToken();
+	return $this->getAuth()->getRefreshToken();
   }
 
   /**
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
    */
   public function isAccessTokenExpired()
   {
-    return $this->getAuth()->isAccessTokenExpired();
+	return $this->getAuth()->isAccessTokenExpired();
   }
 
   /**
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
    */
   public function setState($state)
   {
-    $this->getAuth()->setState($state);
+	$this->getAuth()->setState($state);
   }
 
   /**
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
    */
   public function setAccessType($accessType)
   {
-    $this->config->setAccessType($accessType);
+	$this->config->setAccessType($accessType);
   }
 
   /**
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
    */
   public function setApprovalPrompt($approvalPrompt)
   {
-    $this->config->setApprovalPrompt($approvalPrompt);
+	$this->config->setApprovalPrompt($approvalPrompt);
   }
 
   /**
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
    */
   public function setLoginHint($loginHint)
   {
-      $this->config->setLoginHint($loginHint);
+	  $this->config->setLoginHint($loginHint);
   }
 
   /**
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
    */
   public function setApplicationName($applicationName)
   {
-    $this->config->setApplicationName($applicationName);
+	$this->config->setApplicationName($applicationName);
   }
 
   /**
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
    */
   public function setClientId($clientId)
   {
-    $this->config->setClientId($clientId);
+	$this->config->setClientId($clientId);
   }
 
   /**
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
    */
   public function setClientSecret($clientSecret)
   {
-    $this->config->setClientSecret($clientSecret);
+	$this->config->setClientSecret($clientSecret);
   }
 
   /**
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
    */
   public function setRedirectUri($redirectUri)
   {
-    $this->config->setRedirectUri($redirectUri);
+	$this->config->setRedirectUri($redirectUri);
   }
 
   /**
@@ -388,10 +388,10 @@  discard block
 block discarded – undo
    */
   public function setRequestVisibleActions($requestVisibleActions)
   {
-    if (is_array($requestVisibleActions)) {
-      $requestVisibleActions = join(" ", $requestVisibleActions);
-    }
-    $this->config->setRequestVisibleActions($requestVisibleActions);
+	if (is_array($requestVisibleActions)) {
+	  $requestVisibleActions = join(" ", $requestVisibleActions);
+	}
+	$this->config->setRequestVisibleActions($requestVisibleActions);
   }
 
   /**
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
    */
   public function setDeveloperKey($developerKey)
   {
-    $this->config->setDeveloperKey($developerKey);
+	$this->config->setDeveloperKey($developerKey);
   }
 
   /**
@@ -412,7 +412,7 @@  discard block
 block discarded – undo
    */
   public function setHostedDomain($hd)
   {
-    $this->config->setHostedDomain($hd);
+	$this->config->setHostedDomain($hd);
   }
 
   /**
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
    */
   public function setPrompt($prompt)
   {
-    $this->config->setPrompt($prompt);
+	$this->config->setPrompt($prompt);
   }
 
   /**
@@ -434,7 +434,7 @@  discard block
 block discarded – undo
    */
   public function setOpenidRealm($realm)
   {
-    $this->config->setOpenidRealm($realm);
+	$this->config->setOpenidRealm($realm);
   }
 
   /**
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
    */
   public function setIncludeGrantedScopes($include)
   {
-    $this->config->setIncludeGrantedScopes($include);
+	$this->config->setIncludeGrantedScopes($include);
   }
 
   /**
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
    */
   public function refreshToken($refreshToken)
   {
-    $this->getAuth()->refreshToken($refreshToken);
+	$this->getAuth()->refreshToken($refreshToken);
   }
 
   /**
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
    */
   public function revokeToken($token = null)
   {
-    return $this->getAuth()->revokeToken($token);
+	return $this->getAuth()->revokeToken($token);
   }
 
   /**
@@ -479,7 +479,7 @@  discard block
 block discarded – undo
    */
   public function verifyIdToken($token = null)
   {
-    return $this->getAuth()->verifyIdToken($token);
+	return $this->getAuth()->verifyIdToken($token);
   }
 
   /**
@@ -494,9 +494,9 @@  discard block
 block discarded – undo
    */
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
   {
-    $auth = new Google_Auth_OAuth2($this);
-    $certs = $auth->retrieveCertsFromLocation($cert_location);
-    return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
+	$auth = new Google_Auth_OAuth2($this);
+	$certs = $auth->retrieveCertsFromLocation($cert_location);
+	return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
   }
 
   /**
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
    */
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
   {
-    $this->getAuth()->setAssertionCredentials($creds);
+	$this->getAuth()->setAssertionCredentials($creds);
   }
 
   /**
@@ -515,8 +515,8 @@  discard block
 block discarded – undo
    */
   public function setScopes($scopes)
   {
-    $this->requestedScopes = array();
-    $this->addScope($scopes);
+	$this->requestedScopes = array();
+	$this->addScope($scopes);
   }
 
   /**
@@ -528,13 +528,13 @@  discard block
 block discarded – undo
    */
   public function addScope($scope_or_scopes)
   {
-    if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
-      $this->requestedScopes[] = $scope_or_scopes;
-    } else if (is_array($scope_or_scopes)) {
-      foreach ($scope_or_scopes as $scope) {
-        $this->addScope($scope);
-      }
-    }
+	if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
+	  $this->requestedScopes[] = $scope_or_scopes;
+	} else if (is_array($scope_or_scopes)) {
+	  foreach ($scope_or_scopes as $scope) {
+		$this->addScope($scope);
+	  }
+	}
   }
 
   /**
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
    */
   public function getScopes()
   {
-     return $this->requestedScopes;
+	 return $this->requestedScopes;
   }
 
   /**
@@ -556,8 +556,8 @@  discard block
 block discarded – undo
    */
   public function setUseBatch($useBatch)
   {
-    // This is actually an alias for setDefer.
-    $this->setDefer($useBatch);
+	// This is actually an alias for setDefer.
+	$this->setDefer($useBatch);
   }
 
   /**
@@ -568,7 +568,7 @@  discard block
 block discarded – undo
    */
   public function setDefer($defer)
   {
-    $this->deferExecution = $defer;
+	$this->deferExecution = $defer;
   }
 
   /**
@@ -580,22 +580,22 @@  discard block
 block discarded – undo
    */
   public function execute($request)
   {
-    if ($request instanceof Google_Http_Request) {
-      $request->setUserAgent(
-          $this->getApplicationName()
-          . " " . self::USER_AGENT_SUFFIX
-          . $this->getLibraryVersion()
-      );
-      if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
-        $request->enableGzip();
-      }
-      $request->maybeMoveParametersToBody();
-      return Google_Http_REST::execute($this, $request);
-    } else if ($request instanceof Google_Http_Batch) {
-      return $request->execute();
-    } else {
-      throw new Google_Exception("Do not know how to execute this type of object.");
-    }
+	if ($request instanceof Google_Http_Request) {
+	  $request->setUserAgent(
+		  $this->getApplicationName()
+		  . " " . self::USER_AGENT_SUFFIX
+		  . $this->getLibraryVersion()
+	  );
+	  if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
+		$request->enableGzip();
+	  }
+	  $request->maybeMoveParametersToBody();
+	  return Google_Http_REST::execute($this, $request);
+	} else if ($request instanceof Google_Http_Batch) {
+	  return $request->execute();
+	} else {
+	  throw new Google_Exception("Do not know how to execute this type of object.");
+	}
   }
 
   /**
@@ -604,7 +604,7 @@  discard block
 block discarded – undo
    */
   public function shouldDefer()
   {
-    return $this->deferExecution;
+	return $this->deferExecution;
   }
 
   /**
@@ -612,11 +612,11 @@  discard block
 block discarded – undo
    */
   public function getAuth()
   {
-    if (!isset($this->auth)) {
-      $class = $this->config->getAuthClass();
-      $this->auth = new $class($this);
-    }
-    return $this->auth;
+	if (!isset($this->auth)) {
+	  $class = $this->config->getAuthClass();
+	  $this->auth = new $class($this);
+	}
+	return $this->auth;
   }
 
   /**
@@ -624,11 +624,11 @@  discard block
 block discarded – undo
    */
   public function getIo()
   {
-    if (!isset($this->io)) {
-      $class = $this->config->getIoClass();
-      $this->io = new $class($this);
-    }
-    return $this->io;
+	if (!isset($this->io)) {
+	  $class = $this->config->getIoClass();
+	  $this->io = new $class($this);
+	}
+	return $this->io;
   }
 
   /**
@@ -636,11 +636,11 @@  discard block
 block discarded – undo
    */
   public function getCache()
   {
-    if (!isset($this->cache)) {
-      $class = $this->config->getCacheClass();
-      $this->cache = new $class($this);
-    }
-    return $this->cache;
+	if (!isset($this->cache)) {
+	  $class = $this->config->getCacheClass();
+	  $this->cache = new $class($this);
+	}
+	return $this->cache;
   }
 
   /**
@@ -648,11 +648,11 @@  discard block
 block discarded – undo
    */
   public function getLogger()
   {
-    if (!isset($this->logger)) {
-      $class = $this->config->getLoggerClass();
-      $this->logger = new $class($this);
-    }
-    return $this->logger;
+	if (!isset($this->logger)) {
+	  $class = $this->config->getLoggerClass();
+	  $this->logger = new $class($this);
+	}
+	return $this->logger;
   }
 
   /**
@@ -663,10 +663,10 @@  discard block
 block discarded – undo
    */
   public function getClassConfig($class, $key = null)
   {
-    if (!is_string($class)) {
-      $class = get_class($class);
-    }
-    return $this->config->getClassConfig($class, $key);
+	if (!is_string($class)) {
+	  $class = get_class($class);
+	}
+	return $this->config->getClassConfig($class, $key);
   }
 
   /**
@@ -680,10 +680,10 @@  discard block
 block discarded – undo
    */
   public function setClassConfig($class, $config, $value = null)
   {
-    if (!is_string($class)) {
-      $class = get_class($class);
-    }
-    $this->config->setClassConfig($class, $config, $value);
+	if (!is_string($class)) {
+	  $class = get_class($class);
+	}
+	$this->config->setClassConfig($class, $config, $value);
 
   }
 
@@ -692,7 +692,7 @@  discard block
 block discarded – undo
    */
   public function getBasePath()
   {
-    return $this->config->getBasePath();
+	return $this->config->getBasePath();
   }
 
   /**
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
    */
   public function getApplicationName()
   {
-    return $this->config->getApplicationName();
+	return $this->config->getApplicationName();
   }
 
   /**
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
    */
   public function isAppEngine()
   {
-    return (isset($_SERVER['SERVER_SOFTWARE']) &&
-        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
+	return (isset($_SERVER['SERVER_SOFTWARE']) &&
+		strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
   }
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/autoload.php';
+  require_once dirname(__FILE__).'/autoload.php';
 }
 
 /**
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
   {
     if (is_string($config) && strlen($config)) {
       $config = new Google_Config($config);
-    } else if ( !($config instanceof Google_Config)) {
+    } else if (!($config instanceof Google_Config)) {
       $config = new Google_Config();
 
       if ($this->isAppEngine()) {
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
     if ($request instanceof Google_Http_Request) {
       $request->setUserAgent(
           $this->getApplicationName()
-          . " " . self::USER_AGENT_SUFFIX
+          . " ".self::USER_AGENT_SUFFIX
           . $this->getLibraryVersion()
       );
       if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {

Please login to merge, or discard this patch.

geodirectory-admin/google-api-php-client/src/Google/Http/Request.php 3 patches

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -79,7 +79,7 @@  discard block
 block discarded – undo
   
   /**
    * Set the base URL that path and query parameters will be added to.
-   * @param $baseComponent string
+   * @param string $baseComponent string
    */
   public function setBaseComponent($baseComponent)
   {
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
 
   /**
    * Set a new query parameter.
-   * @param $key - string to set, does not need to be URL encoded
+   * @param string $key - string to set, does not need to be URL encoded
    * @param $value - string to set, does not need to be URL encoded
    */
   public function setQueryParam($key, $value)
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
   }
 
   /**
-   * @return string HTTP Response Code.
+   * @return integer HTTP Response Code.
    */
   public function getResponseHttpCode()
   {

Please login to merge, or discard this patch.

Indentation +156 added lines, -156 removed lines patch added patch discarded remove patch

@@ -32,9 +32,9 @@  discard block
 block discarded – undo
   const GZIP_UA = " (gzip)";
 
   private $batchHeaders = array(
-    'Content-Type' => 'application/http',
-    'Content-Transfer-Encoding' => 'binary',
-    'MIME-Version' => '1.0',
+	'Content-Type' => 'application/http',
+	'Content-Transfer-Encoding' => 'binary',
+	'MIME-Version' => '1.0',
   );
 
   protected $queryParams;
@@ -56,15 +56,15 @@  discard block
 block discarded – undo
   public $accessKey;
 
   public function __construct(
-      $url,
-      $method = 'GET',
-      $headers = array(),
-      $postBody = null
+	  $url,
+	  $method = 'GET',
+	  $headers = array(),
+	  $postBody = null
   ) {
-    $this->setUrl($url);
-    $this->setRequestMethod($method);
-    $this->setRequestHeaders($headers);
-    $this->setPostBody($postBody);
+	$this->setUrl($url);
+	$this->setRequestMethod($method);
+	$this->setRequestHeaders($headers);
+	$this->setPostBody($postBody);
   }
 
   /**
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
    */
   public function getBaseComponent()
   {
-    return $this->baseComponent;
+	return $this->baseComponent;
   }
   
   /**
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
    */
   public function setBaseComponent($baseComponent)
   {
-    $this->baseComponent = rtrim($baseComponent, '/');
+	$this->baseComponent = rtrim($baseComponent, '/');
   }
   
   /**
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
    */
   public function enableGzip()
   {
-    $this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
-    $this->canGzip = true;
-    $this->setUserAgent($this->userAgent);
+	$this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
+	$this->canGzip = true;
+	$this->setUserAgent($this->userAgent);
   }
   
   /**
@@ -101,14 +101,14 @@  discard block
 block discarded – undo
    */
   public function disableGzip()
   {
-    if (
-        isset($this->requestHeaders['accept-encoding']) &&
-        $this->requestHeaders['accept-encoding'] == "gzip"
-    ) {
-      unset($this->requestHeaders['accept-encoding']);
-    }
-    $this->canGzip = false;
-    $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
+	if (
+		isset($this->requestHeaders['accept-encoding']) &&
+		$this->requestHeaders['accept-encoding'] == "gzip"
+	) {
+	  unset($this->requestHeaders['accept-encoding']);
+	}
+	$this->canGzip = false;
+	$this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
   }
   
   /**
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
    */
   public function canGzip()
   {
-    return $this->canGzip;
+	return $this->canGzip;
   }
 
   /**
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
    */
   public function getQueryParams()
   {
-    return $this->queryParams;
+	return $this->queryParams;
   }
 
   /**
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
    */
   public function setQueryParam($key, $value)
   {
-    $this->queryParams[$key] = $value;
+	$this->queryParams[$key] = $value;
   }
 
   /**
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
    */
   public function getResponseHttpCode()
   {
-    return (int) $this->responseHttpCode;
+	return (int) $this->responseHttpCode;
   }
 
   /**
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
    */
   public function setResponseHttpCode($responseHttpCode)
   {
-    $this->responseHttpCode = $responseHttpCode;
+	$this->responseHttpCode = $responseHttpCode;
   }
 
   /**
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
    */
   public function getResponseHeaders()
   {
-    return $this->responseHeaders;
+	return $this->responseHeaders;
   }
 
   /**
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
    */
   public function getResponseBody()
   {
-    return $this->responseBody;
+	return $this->responseBody;
   }
   
   /**
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
    */
   public function setExpectedClass($class)
   {
-    $this->expectedClass = $class;
+	$this->expectedClass = $class;
   }
   
   /**
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
    */
   public function getExpectedClass()
   {
-    return $this->expectedClass;
+	return $this->expectedClass;
   }
 
   /**
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
    */
   public function enableExpectedRaw()
   {
-    $this->expectedRaw = true;
+	$this->expectedRaw = true;
   }
 
   /**
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
    */
   public function disableExpectedRaw()
   {
-    $this->expectedRaw = false;
+	$this->expectedRaw = false;
   }
 
   /**
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
    */
   public function getExpectedRaw()
   {
-    return $this->expectedRaw;
+	return $this->expectedRaw;
   }
 
   /**
@@ -222,12 +222,12 @@  discard block
 block discarded – undo
    */
   public function setResponseHeaders($headers)
   {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->responseHeaders) {
-      $headers = array_merge($this->responseHeaders, $headers);
-    }
+	$headers = Google_Utils::normalize($headers);
+	if ($this->responseHeaders) {
+	  $headers = array_merge($this->responseHeaders, $headers);
+	}
 
-    $this->responseHeaders = $headers;
+	$this->responseHeaders = $headers;
   }
 
   /**
@@ -237,9 +237,9 @@  discard block
 block discarded – undo
    */
   public function getResponseHeader($key)
   {
-    return isset($this->responseHeaders[$key])
-        ? $this->responseHeaders[$key]
-        : false;
+	return isset($this->responseHeaders[$key])
+		? $this->responseHeaders[$key]
+		: false;
   }
 
   /**
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
    */
   public function setResponseBody($responseBody)
   {
-    $this->responseBody = $responseBody;
+	$this->responseBody = $responseBody;
   }
 
   /**
@@ -255,10 +255,10 @@  discard block
 block discarded – undo
    */
   public function getUrl()
   {
-    return $this->baseComponent . $this->path .
-        (count($this->queryParams) ?
-            "?" . $this->buildQuery($this->queryParams) :
-            '');
+	return $this->baseComponent . $this->path .
+		(count($this->queryParams) ?
+			"?" . $this->buildQuery($this->queryParams) :
+			'');
   }
 
   /**
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
    */
   public function getRequestMethod()
   {
-    return $this->requestMethod;
+	return $this->requestMethod;
   }
 
   /**
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
    */
   public function getRequestHeaders()
   {
-    return $this->requestHeaders;
+	return $this->requestHeaders;
   }
 
   /**
@@ -284,9 +284,9 @@  discard block
 block discarded – undo
    */
   public function getRequestHeader($key)
   {
-    return isset($this->requestHeaders[$key])
-        ? $this->requestHeaders[$key]
-        : false;
+	return isset($this->requestHeaders[$key])
+		? $this->requestHeaders[$key]
+		: false;
   }
 
   /**
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
    */
   public function getPostBody()
   {
-    return $this->postBody;
+	return $this->postBody;
   }
 
   /**
@@ -302,26 +302,26 @@  discard block
 block discarded – undo
    */
   public function setUrl($url)
   {
-    if (substr($url, 0, 4) != 'http') {
-      // Force the path become relative.
-      if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
-      }
-    }
-    $parts = parse_url($url);
-    if (isset($parts['host'])) {
-      $this->baseComponent = sprintf(
-          "%s%s%s",
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
-          isset($parts['host']) ? $parts['host'] : '',
-          isset($parts['port']) ? ":" . $parts['port'] : ''
-      );
-    }
-    $this->path = isset($parts['path']) ? $parts['path'] : '';
-    $this->queryParams = array();
-    if (isset($parts['query'])) {
-      $this->queryParams = $this->parseQuery($parts['query']);
-    }
+	if (substr($url, 0, 4) != 'http') {
+	  // Force the path become relative.
+	  if (substr($url, 0, 1) !== '/') {
+		$url = '/' . $url;
+	  }
+	}
+	$parts = parse_url($url);
+	if (isset($parts['host'])) {
+	  $this->baseComponent = sprintf(
+		  "%s%s%s",
+		  isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
+		  isset($parts['host']) ? $parts['host'] : '',
+		  isset($parts['port']) ? ":" . $parts['port'] : ''
+	  );
+	}
+	$this->path = isset($parts['path']) ? $parts['path'] : '';
+	$this->queryParams = array();
+	if (isset($parts['query'])) {
+	  $this->queryParams = $this->parseQuery($parts['query']);
+	}
   }
 
   /**
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
    */
   public function setRequestMethod($method)
   {
-    $this->requestMethod = strtoupper($method);
+	$this->requestMethod = strtoupper($method);
   }
 
   /**
@@ -340,11 +340,11 @@  discard block
 block discarded – undo
    */
   public function setRequestHeaders($headers)
   {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->requestHeaders) {
-      $headers = array_merge($this->requestHeaders, $headers);
-    }
-    $this->requestHeaders = $headers;
+	$headers = Google_Utils::normalize($headers);
+	if ($this->requestHeaders) {
+	  $headers = array_merge($this->requestHeaders, $headers);
+	}
+	$this->requestHeaders = $headers;
   }
 
   /**
@@ -352,7 +352,7 @@  discard block
 block discarded – undo
    */
   public function setPostBody($postBody)
   {
-    $this->postBody = $postBody;
+	$this->postBody = $postBody;
   }
 
   /**
@@ -361,10 +361,10 @@  discard block
 block discarded – undo
    */
   public function setUserAgent($userAgent)
   {
-    $this->userAgent = $userAgent;
-    if ($this->canGzip) {
-      $this->userAgent = $userAgent . self::GZIP_UA;
-    }
+	$this->userAgent = $userAgent;
+	if ($this->canGzip) {
+	  $this->userAgent = $userAgent . self::GZIP_UA;
+	}
   }
 
   /**
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
    */
   public function getUserAgent()
   {
-    return $this->userAgent;
+	return $this->userAgent;
   }
 
   /**
@@ -383,29 +383,29 @@  discard block
 block discarded – undo
    */
   public function getCacheKey()
   {
-    $key = $this->getUrl();
+	$key = $this->getUrl();
 
-    if (isset($this->accessKey)) {
-      $key .= $this->accessKey;
-    }
+	if (isset($this->accessKey)) {
+	  $key .= $this->accessKey;
+	}
 
-    if (isset($this->requestHeaders['authorization'])) {
-      $key .= $this->requestHeaders['authorization'];
-    }
+	if (isset($this->requestHeaders['authorization'])) {
+	  $key .= $this->requestHeaders['authorization'];
+	}
 
-    return md5($key);
+	return md5($key);
   }
 
   public function getParsedCacheControl()
   {
-    $parsed = array();
-    $rawCacheControl = $this->getResponseHeader('cache-control');
-    if ($rawCacheControl) {
-      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
-      parse_str($rawCacheControl, $parsed);
-    }
+	$parsed = array();
+	$rawCacheControl = $this->getResponseHeader('cache-control');
+	if ($rawCacheControl) {
+	  $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
+	  parse_str($rawCacheControl, $parsed);
+	}
 
-    return $parsed;
+	return $parsed;
   }
 
   /**
@@ -414,29 +414,29 @@  discard block
 block discarded – undo
    */
   public function toBatchString($id)
   {
-    $str = '';
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
-        http_build_query($this->queryParams);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+	$str = '';
+	$path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
+		http_build_query($this->queryParams);
+	$str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
 
-    foreach ($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
-    }
+	foreach ($this->getRequestHeaders() as $key => $val) {
+	  $str .= $key . ': ' . $val . "\n";
+	}
 
-    if ($this->getPostBody()) {
-      $str .= "\n";
-      $str .= $this->getPostBody();
-    }
+	if ($this->getPostBody()) {
+	  $str .= "\n";
+	  $str .= $this->getPostBody();
+	}
     
-    $headers = '';
-    foreach ($this->batchHeaders as $key => $val) {
-      $headers .= $key . ': ' . $val . "\n";
-    }
+	$headers = '';
+	foreach ($this->batchHeaders as $key => $val) {
+	  $headers .= $key . ': ' . $val . "\n";
+	}
 
-    $headers .= "Content-ID: $id\n";
-    $str = $headers . "\n" . $str;
+	$headers .= "Content-ID: $id\n";
+	$str = $headers . "\n" . $str;
 
-    return $str;
+	return $str;
   }
   
   /**
@@ -446,21 +446,21 @@  discard block
 block discarded – undo
    */
   private function parseQuery($string)
   {
-    $return = array();
-    $parts = explode("&", $string);
-    foreach ($parts as $part) {
-      list($key, $value) = explode('=', $part, 2);
-      $value = urldecode($value);
-      if (isset($return[$key])) {
-        if (!is_array($return[$key])) {
-          $return[$key] = array($return[$key]);
-        }
-        $return[$key][] = $value;
-      } else {
-        $return[$key] = $value;
-      }
-    }
-    return $return;
+	$return = array();
+	$parts = explode("&", $string);
+	foreach ($parts as $part) {
+	  list($key, $value) = explode('=', $part, 2);
+	  $value = urldecode($value);
+	  if (isset($return[$key])) {
+		if (!is_array($return[$key])) {
+		  $return[$key] = array($return[$key]);
+		}
+		$return[$key][] = $value;
+	  } else {
+		$return[$key] = $value;
+	  }
+	}
+	return $return;
   }
   
   /**
@@ -470,17 +470,17 @@  discard block
 block discarded – undo
    */
   private function buildQuery($parts)
   {
-    $return = array();
-    foreach ($parts as $key => $value) {
-      if (is_array($value)) {
-        foreach ($value as $v) {
-          $return[] = urlencode($key) . "=" . urlencode($v);
-        }
-      } else {
-        $return[] = urlencode($key) . "=" . urlencode($value);
-      }
-    }
-    return implode('&', $return);
+	$return = array();
+	foreach ($parts as $key => $value) {
+	  if (is_array($value)) {
+		foreach ($value as $v) {
+		  $return[] = urlencode($key) . "=" . urlencode($v);
+		}
+	  } else {
+		$return[] = urlencode($key) . "=" . urlencode($value);
+	  }
+	}
+	return implode('&', $return);
   }
   
   /**
@@ -490,15 +490,15 @@  discard block
 block discarded – undo
    */
   public function maybeMoveParametersToBody()
   {
-    if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
-      $this->setRequestHeaders(
-          array(
-            "content-type" =>
-                "application/x-www-form-urlencoded; charset=UTF-8"
-          )
-      );
-      $this->setPostBody($this->buildQuery($this->queryParams));
-      $this->queryParams = array();
-    }
+	if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
+	  $this->setRequestHeaders(
+		  array(
+			"content-type" =>
+				"application/x-www-form-urlencoded; charset=UTF-8"
+		  )
+	  );
+	  $this->setPostBody($this->buildQuery($this->queryParams));
+	  $this->queryParams = array();
+	}
   }
 }

Please login to merge, or discard this patch.

Spacing +14 added lines, -15 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -255,10 +255,9 @@  discard block
 block discarded – undo
    */
   public function getUrl()
   {
-    return $this->baseComponent . $this->path .
+    return $this->baseComponent.$this->path.
         (count($this->queryParams) ?
-            "?" . $this->buildQuery($this->queryParams) :
-            '');
+            "?".$this->buildQuery($this->queryParams) : '');
   }
 
   /**
@@ -305,16 +304,16 @@  discard block
 block discarded – undo
     if (substr($url, 0, 4) != 'http') {
       // Force the path become relative.
       if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
+        $url = '/'.$url;
       }
     }
     $parts = parse_url($url);
     if (isset($parts['host'])) {
       $this->baseComponent = sprintf(
           "%s%s%s",
-          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
+          isset($parts['scheme']) ? $parts['scheme']."://" : '',
           isset($parts['host']) ? $parts['host'] : '',
-          isset($parts['port']) ? ":" . $parts['port'] : ''
+          isset($parts['port']) ? ":".$parts['port'] : ''
       );
     }
     $this->path = isset($parts['path']) ? $parts['path'] : '';
@@ -363,7 +362,7 @@  discard block
 block discarded – undo
   {
     $this->userAgent = $userAgent;
     if ($this->canGzip) {
-      $this->userAgent = $userAgent . self::GZIP_UA;
+      $this->userAgent = $userAgent.self::GZIP_UA;
     }
   }
 
@@ -415,12 +414,12 @@  discard block
 block discarded – undo
   public function toBatchString($id)
   {
     $str = '';
-    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
+    $path = parse_url($this->getUrl(), PHP_URL_PATH)."?".
         http_build_query($this->queryParams);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+    $str .= $this->getRequestMethod().' '.$path." HTTP/1.1\n";
 
     foreach ($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
+      $str .= $key.': '.$val."\n";
     }
 
     if ($this->getPostBody()) {
@@ -430,11 +429,11 @@  discard block
 block discarded – undo
     
     $headers = '';
     foreach ($this->batchHeaders as $key => $val) {
-      $headers .= $key . ': ' . $val . "\n";
+      $headers .= $key.': '.$val."\n";
     }
 
     $headers .= "Content-ID: $id\n";
-    $str = $headers . "\n" . $str;
+    $str = $headers."\n".$str;
 
     return $str;
   }
@@ -474,10 +473,10 @@  discard block
 block discarded – undo
     foreach ($parts as $key => $value) {
       if (is_array($value)) {
         foreach ($value as $v) {
-          $return[] = urlencode($key) . "=" . urlencode($v);
+          $return[] = urlencode($key)."=".urlencode($v);
         }
       } else {
-        $return[] = urlencode($key) . "=" . urlencode($value);
+        $return[] = urlencode($key)."=".urlencode($value);
       }
     }
     return implode('&', $return);

Please login to merge, or discard this patch.

geodirectory-admin/google-api-php-client/src/Google/Logger/Abstract.php 3 patches

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -261,7 +261,7 @@  discard block
 block discarded – undo
   /**
    * Logs with an arbitrary level.
    *
-   * @param mixed $level    The log level
+   * @param string $level    The log level
    * @param string $message The log message
    * @param array $context  The log context
    */
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
   /**
    * Converts a given log level to the integer form.
    *
-   * @param  mixed $level   The logging level
+   * @param  integer $level   The logging level
    * @return integer $level The normalized level
    * @throws Google_Logger_Exception If $level is invalid
    */

Please login to merge, or discard this patch.

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

@@ -88,14 +88,14 @@  discard block
 block discarded – undo
    * @var array $levels Logging levels
    */
   protected static $levels = array(
-      self::EMERGENCY  => 600,
-      self::ALERT => 550,
-      self::CRITICAL => 500,
-      self::ERROR => 400,
-      self::WARNING => 300,
-      self::NOTICE => 250,
-      self::INFO => 200,
-      self::DEBUG => 100,
+	  self::EMERGENCY  => 600,
+	  self::ALERT => 550,
+	  self::CRITICAL => 500,
+	  self::ERROR => 400,
+	  self::WARNING => 300,
+	  self::NOTICE => 250,
+	  self::INFO => 200,
+	  self::DEBUG => 100,
   );
 
   /**
@@ -122,20 +122,20 @@  discard block
 block discarded – undo
    */
   public function __construct(Google_Client $client)
   {
-    $this->setLevel(
-        $client->getClassConfig('Google_Logger_Abstract', 'level')
-    );
+	$this->setLevel(
+		$client->getClassConfig('Google_Logger_Abstract', 'level')
+	);
 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
-    $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
+	$this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
 
-    $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
-    $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
+	$format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
+	$this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
 
-    $this->allowNewLines = (bool) $client->getClassConfig(
-        'Google_Logger_Abstract',
-        'allow_newlines'
-    );
+	$this->allowNewLines = (bool) $client->getClassConfig(
+		'Google_Logger_Abstract',
+		'allow_newlines'
+	);
   }
 
   /**
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
    */
   public function setLevel($level)
   {
-    $this->level = $this->normalizeLevel($level);
+	$this->level = $this->normalizeLevel($level);
   }
 
   /**
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
    */
   public function shouldHandle($level)
   {
-    return $this->normalizeLevel($level) >= $this->level;
+	return $this->normalizeLevel($level) >= $this->level;
   }
 
   /**
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
    */
   public function emergency($message, array $context = array())
   {
-    $this->log(self::EMERGENCY, $message, $context);
+	$this->log(self::EMERGENCY, $message, $context);
   }
 
   /**
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
    */
   public function alert($message, array $context = array())
   {
-    $this->log(self::ALERT, $message, $context);
+	$this->log(self::ALERT, $message, $context);
   }
 
   /**
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
    */
   public function critical($message, array $context = array())
   {
-    $this->log(self::CRITICAL, $message, $context);
+	$this->log(self::CRITICAL, $message, $context);
   }
 
   /**
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
    */
   public function error($message, array $context = array())
   {
-    $this->log(self::ERROR, $message, $context);
+	$this->log(self::ERROR, $message, $context);
   }
 
   /**
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
    */
   public function warning($message, array $context = array())
   {
-    $this->log(self::WARNING, $message, $context);
+	$this->log(self::WARNING, $message, $context);
   }
 
   /**
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
    */
   public function notice($message, array $context = array())
   {
-    $this->log(self::NOTICE, $message, $context);
+	$this->log(self::NOTICE, $message, $context);
   }
 
   /**
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
    */
   public function info($message, array $context = array())
   {
-    $this->log(self::INFO, $message, $context);
+	$this->log(self::INFO, $message, $context);
   }
 
   /**
@@ -255,7 +255,7 @@  discard block
 block discarded – undo
    */
   public function debug($message, array $context = array())
   {
-    $this->log(self::DEBUG, $message, $context);
+	$this->log(self::DEBUG, $message, $context);
   }
 
   /**
@@ -267,21 +267,21 @@  discard block
 block discarded – undo
    */
   public function log($level, $message, array $context = array())
   {
-    if (!$this->shouldHandle($level)) {
-      return false;
-    }
-
-    $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
-    $message = $this->interpolate(
-        array(
-            'message' => $message,
-            'context' => $context,
-            'level' => strtoupper($levelName),
-            'datetime' => new DateTime(),
-        )
-    );
-
-    $this->write($message);
+	if (!$this->shouldHandle($level)) {
+	  return false;
+	}
+
+	$levelName = is_int($level) ? array_search($level, self::$levels) : $level;
+	$message = $this->interpolate(
+		array(
+			'message' => $message,
+			'context' => $context,
+			'level' => strtoupper($levelName),
+			'datetime' => new DateTime(),
+		)
+	);
+
+	$this->write($message);
   }
 
   /**
@@ -292,26 +292,26 @@  discard block
 block discarded – undo
    */
   protected function interpolate(array $variables = array())
   {
-    $template = $this->logFormat;
-
-    if (!$variables['context']) {
-      $template = str_replace('%context%', '', $template);
-      unset($variables['context']);
-    } else {
-      $this->reverseJsonInContext($variables['context']);
-    }
-
-    foreach ($variables as $key => $value) {
-      if (strpos($template, '%'. $key .'%') !== false) {
-        $template = str_replace(
-            '%' . $key . '%',
-            $this->export($value),
-            $template
-        );
-      }
-    }
-
-    return $template;
+	$template = $this->logFormat;
+
+	if (!$variables['context']) {
+	  $template = str_replace('%context%', '', $template);
+	  unset($variables['context']);
+	} else {
+	  $this->reverseJsonInContext($variables['context']);
+	}
+
+	foreach ($variables as $key => $value) {
+	  if (strpos($template, '%'. $key .'%') !== false) {
+		$template = str_replace(
+			'%' . $key . '%',
+			$this->export($value),
+			$template
+		);
+	  }
+	}
+
+	return $template;
   }
 
   /**
@@ -321,20 +321,20 @@  discard block
 block discarded – undo
    */
   protected function reverseJsonInContext(array &$context)
   {
-    if (!$context) {
-      return;
-    }
-
-    foreach ($context as $key => $val) {
-      if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
-        continue;
-      }
-
-      $json = @json_decode($val);
-      if (is_object($json) || is_array($json)) {
-        $context[$key] = $json;
-      }
-    }
+	if (!$context) {
+	  return;
+	}
+
+	foreach ($context as $key => $val) {
+	  if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
+		continue;
+	  }
+
+	  $json = @json_decode($val);
+	  if (is_object($json) || is_array($json)) {
+		$context[$key] = $json;
+	  }
+	}
   }
 
   /**
@@ -344,37 +344,37 @@  discard block
 block discarded – undo
    */
   protected function export($value)
   {
-    if (is_string($value)) {
-      if ($this->allowNewLines) {
-        return $value;
-      }
+	if (is_string($value)) {
+	  if ($this->allowNewLines) {
+		return $value;
+	  }
 
-      return preg_replace('/[\r\n]+/', ' ', $value);
-    }
+	  return preg_replace('/[\r\n]+/', ' ', $value);
+	}
 
-    if (is_resource($value)) {
-      return sprintf(
-          'resource(%d) of type (%s)',
-          $value,
-          get_resource_type($value)
-      );
-    }
+	if (is_resource($value)) {
+	  return sprintf(
+		  'resource(%d) of type (%s)',
+		  $value,
+		  get_resource_type($value)
+	  );
+	}
 
-    if ($value instanceof DateTime) {
-      return $value->format($this->dateFormat);
-    }
+	if ($value instanceof DateTime) {
+	  return $value->format($this->dateFormat);
+	}
 
-    if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
-      $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+	if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+	  $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
 
-      if ($this->allowNewLines) {
-        $options |= JSON_PRETTY_PRINT;
-      }
+	  if ($this->allowNewLines) {
+		$options |= JSON_PRETTY_PRINT;
+	  }
 
-      return @json_encode($value, $options);
-    }
+	  return @json_encode($value, $options);
+	}
 
-    return str_replace('\\/', '/', @json_encode($value));
+	return str_replace('\\/', '/', @json_encode($value));
   }
 
   /**
@@ -386,17 +386,17 @@  discard block
 block discarded – undo
    */
   protected function normalizeLevel($level)
   {
-    if (is_int($level) && array_search($level, self::$levels) !== false) {
-      return $level;
-    }
+	if (is_int($level) && array_search($level, self::$levels) !== false) {
+	  return $level;
+	}
 
-    if (is_string($level) && isset(self::$levels[$level])) {
-      return self::$levels[$level];
-    }
+	if (is_string($level) && isset(self::$levels[$level])) {
+	  return self::$levels[$level];
+	}
 
-    throw new Google_Logger_Exception(
-        sprintf("Unknown LogLevel: '%s'", $level)
-    );
+	throw new Google_Logger_Exception(
+		sprintf("Unknown LogLevel: '%s'", $level)
+	);
   }
 
   /**

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -16,7 +16,7 @@  discard block
 block discarded – undo
  */
 
 if (!class_exists('Google_Client')) {
-  require_once dirname(__FILE__) . '/../autoload.php';
+  require_once dirname(__FILE__).'/../autoload.php';
 }
 
 /**
@@ -302,9 +302,9 @@  discard block
 block discarded – undo
     }
 
     foreach ($variables as $key => $value) {
-      if (strpos($template, '%'. $key .'%') !== false) {
+      if (strpos($template, '%'.$key.'%') !== false) {
         $template = str_replace(
-            '%' . $key . '%',
+            '%'.$key.'%',
             $this->export($value),
             $template
         );

Please login to merge, or discard this patch.

geodirectory-admin/google-api-php-client/src/Google/Model.php 3 patches

Doc Comments +4 added lines, -1 removed lines patch added patch discarded remove patch

@@ -221,7 +221,7 @@  discard block
 block discarded – undo
   /**
    * Given a variable name, discover its type.
    *
-   * @param $name
+   * @param string $name
    * @param $item
    * @return object The object from the item.
    */
@@ -278,6 +278,9 @@  discard block
 block discarded – undo
     return $key . "Type";
   }
 
+  /**
+   * @param string $key
+   */
   protected function dataType($key)
   {
     return $key . "DataType";

Please login to merge, or discard this patch.

Indentation +126 added lines, -126 removed lines patch added patch discarded remove patch

@@ -38,12 +38,12 @@  discard block
 block discarded – undo
    */
   final public function __construct()
   {
-    if (func_num_args() == 1 && is_array(func_get_arg(0))) {
-      // Initialize the model with the array's contents.
-      $array = func_get_arg(0);
-      $this->mapTypes($array);
-    }
-    $this->gapiInit();
+	if (func_num_args() == 1 && is_array(func_get_arg(0))) {
+	  // Initialize the model with the array's contents.
+	  $array = func_get_arg(0);
+	  $this->mapTypes($array);
+	}
+	$this->gapiInit();
   }
 
   /**
@@ -53,39 +53,39 @@  discard block
 block discarded – undo
    */
   public function __get($key)
   {
-    $keyTypeName = $this->keyType($key);
-    $keyDataType = $this->dataType($key);
-    if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
-      if (isset($this->modelData[$key])) {
-        $val = $this->modelData[$key];
-      } else if (isset($this->$keyDataType) &&
-          ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
-        $val = array();
-      } else {
-        $val = null;
-      }
+	$keyTypeName = $this->keyType($key);
+	$keyDataType = $this->dataType($key);
+	if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
+	  if (isset($this->modelData[$key])) {
+		$val = $this->modelData[$key];
+	  } else if (isset($this->$keyDataType) &&
+		  ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
+		$val = array();
+	  } else {
+		$val = null;
+	  }
 
-      if ($this->isAssociativeArray($val)) {
-        if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
-          foreach ($val as $arrayKey => $arrayItem) {
-              $this->modelData[$key][$arrayKey] =
-                $this->createObjectFromName($keyTypeName, $arrayItem);
-          }
-        } else {
-          $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
-        }
-      } else if (is_array($val)) {
-        $arrayObject = array();
-        foreach ($val as $arrayIndex => $arrayItem) {
-          $arrayObject[$arrayIndex] =
-            $this->createObjectFromName($keyTypeName, $arrayItem);
-        }
-        $this->modelData[$key] = $arrayObject;
-      }
-      $this->processed[$key] = true;
-    }
+	  if ($this->isAssociativeArray($val)) {
+		if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
+		  foreach ($val as $arrayKey => $arrayItem) {
+			  $this->modelData[$key][$arrayKey] =
+				$this->createObjectFromName($keyTypeName, $arrayItem);
+		  }
+		} else {
+		  $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
+		}
+	  } else if (is_array($val)) {
+		$arrayObject = array();
+		foreach ($val as $arrayIndex => $arrayItem) {
+		  $arrayObject[$arrayIndex] =
+			$this->createObjectFromName($keyTypeName, $arrayItem);
+		}
+		$this->modelData[$key] = $arrayObject;
+	  }
+	  $this->processed[$key] = true;
+	}
 
-    return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
+	return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
   }
 
   /**
@@ -96,19 +96,19 @@  discard block
 block discarded – undo
    */
   protected function mapTypes($array)
   {
-    // Hard initialise simple types, lazy load more complex ones.
-    foreach ($array as $key => $val) {
-      if ( !property_exists($this, $this->keyType($key)) &&
-        property_exists($this, $key)) {
-          $this->$key = $val;
-          unset($array[$key]);
-      } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
-          // This checks if property exists as camelCase, leaving it in array as snake_case
-          // in case of backwards compatibility issues.
-          $this->$camelKey = $val;
-      }
-    }
-    $this->modelData = $array;
+	// Hard initialise simple types, lazy load more complex ones.
+	foreach ($array as $key => $val) {
+	  if ( !property_exists($this, $this->keyType($key)) &&
+		property_exists($this, $key)) {
+		  $this->$key = $val;
+		  unset($array[$key]);
+	  } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
+		  // This checks if property exists as camelCase, leaving it in array as snake_case
+		  // in case of backwards compatibility issues.
+		  $this->$camelKey = $val;
+	  }
+	}
+	$this->modelData = $array;
   }
 
   /**
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
    */
   protected function gapiInit()
   {
-    return;
+	return;
   }
 
   /**
@@ -129,29 +129,29 @@  discard block
 block discarded – undo
    */
   public function toSimpleObject()
   {
-    $object = new stdClass();
+	$object = new stdClass();
 
-    // Process all other data.
-    foreach ($this->modelData as $key => $val) {
-      $result = $this->getSimpleValue($val);
-      if ($result !== null) {
-        $object->$key = $this->nullPlaceholderCheck($result);
-      }
-    }
+	// Process all other data.
+	foreach ($this->modelData as $key => $val) {
+	  $result = $this->getSimpleValue($val);
+	  if ($result !== null) {
+		$object->$key = $this->nullPlaceholderCheck($result);
+	  }
+	}
 
-    // Process all public properties.
-    $reflect = new ReflectionObject($this);
-    $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
-    foreach ($props as $member) {
-      $name = $member->getName();
-      $result = $this->getSimpleValue($this->$name);
-      if ($result !== null) {
-        $name = $this->getMappedName($name);
-        $object->$name = $this->nullPlaceholderCheck($result);
-      }
-    }
+	// Process all public properties.
+	$reflect = new ReflectionObject($this);
+	$props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
+	foreach ($props as $member) {
+	  $name = $member->getName();
+	  $result = $this->getSimpleValue($this->$name);
+	  if ($result !== null) {
+		$name = $this->getMappedName($name);
+		$object->$name = $this->nullPlaceholderCheck($result);
+	  }
+	}
 
-    return $object;
+	return $object;
   }
 
   /**
@@ -160,20 +160,20 @@  discard block
 block discarded – undo
    */
   private function getSimpleValue($value)
   {
-    if ($value instanceof Google_Model) {
-      return $value->toSimpleObject();
-    } else if (is_array($value)) {
-      $return = array();
-      foreach ($value as $key => $a_value) {
-        $a_value = $this->getSimpleValue($a_value);
-        if ($a_value !== null) {
-          $key = $this->getMappedName($key);
-          $return[$key] = $this->nullPlaceholderCheck($a_value);
-        }
-      }
-      return $return;
-    }
-    return $value;
+	if ($value instanceof Google_Model) {
+	  return $value->toSimpleObject();
+	} else if (is_array($value)) {
+	  $return = array();
+	  foreach ($value as $key => $a_value) {
+		$a_value = $this->getSimpleValue($a_value);
+		if ($a_value !== null) {
+		  $key = $this->getMappedName($key);
+		  $return[$key] = $this->nullPlaceholderCheck($a_value);
+		}
+	  }
+	  return $return;
+	}
+	return $value;
   }
   
   /**
@@ -181,10 +181,10 @@  discard block
 block discarded – undo
    */
   private function nullPlaceholderCheck($value)
   {
-    if ($value === self::NULL_VALUE) {
-      return null;
-    }
-    return $value;
+	if ($value === self::NULL_VALUE) {
+	  return null;
+	}
+	return $value;
   }
 
   /**
@@ -192,11 +192,11 @@  discard block
 block discarded – undo
    */
   private function getMappedName($key)
   {
-    if (isset($this->internal_gapi_mappings) &&
-        isset($this->internal_gapi_mappings[$key])) {
-      $key = $this->internal_gapi_mappings[$key];
-    }
-    return $key;
+	if (isset($this->internal_gapi_mappings) &&
+		isset($this->internal_gapi_mappings[$key])) {
+	  $key = $this->internal_gapi_mappings[$key];
+	}
+	return $key;
   }
 
   /**
@@ -206,16 +206,16 @@  discard block
 block discarded – undo
    */
   protected function isAssociativeArray($array)
   {
-    if (!is_array($array)) {
-      return false;
-    }
-    $keys = array_keys($array);
-    foreach ($keys as $key) {
-      if (is_string($key)) {
-        return true;
-      }
-    }
-    return false;
+	if (!is_array($array)) {
+	  return false;
+	}
+	$keys = array_keys($array);
+	foreach ($keys as $key) {
+	  if (is_string($key)) {
+		return true;
+	  }
+	}
+	return false;
   }
 
   /**
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
    */
   private function createObjectFromName($name, $item)
   {
-    $type = $this->$name;
-    return new $type($item);
+	$type = $this->$name;
+	return new $type($item);
   }
 
   /**
@@ -239,57 +239,57 @@  discard block
 block discarded – undo
    */
   public function assertIsArray($obj, $method)
   {
-    if ($obj && !is_array($obj)) {
-      throw new Google_Exception(
-          "Incorrect parameter type passed to $method(). Expected an array."
-      );
-    }
+	if ($obj && !is_array($obj)) {
+	  throw new Google_Exception(
+		  "Incorrect parameter type passed to $method(). Expected an array."
+	  );
+	}
   }
 
   public function offsetExists($offset)
   {
-    return isset($this->$offset) || isset($this->modelData[$offset]);
+	return isset($this->$offset) || isset($this->modelData[$offset]);
   }
 
   public function offsetGet($offset)
   {
-    return isset($this->$offset) ?
-        $this->$offset :
-        $this->__get($offset);
+	return isset($this->$offset) ?
+		$this->$offset :
+		$this->__get($offset);
   }
 
   public function offsetSet($offset, $value)
   {
-    if (property_exists($this, $offset)) {
-      $this->$offset = $value;
-    } else {
-      $this->modelData[$offset] = $value;
-      $this->processed[$offset] = true;
-    }
+	if (property_exists($this, $offset)) {
+	  $this->$offset = $value;
+	} else {
+	  $this->modelData[$offset] = $value;
+	  $this->processed[$offset] = true;
+	}
   }
 
   public function offsetUnset($offset)
   {
-    unset($this->modelData[$offset]);
+	unset($this->modelData[$offset]);
   }
 
   protected function keyType($key)
   {
-    return $key . "Type";
+	return $key . "Type";
   }
 
   protected function dataType($key)
   {
-    return $key . "DataType";
+	return $key . "DataType";
   }
 
   public function __isset($key)
   {
-    return isset($this->modelData[$key]);
+	return isset($this->modelData[$key]);
   }
 
   public function __unset($key)
   {
-    unset($this->modelData[$key]);
+	unset($this->modelData[$key]);
   }
 }

Please login to merge, or discard this patch.

Spacing +4 added lines, -5 removed lines patch added patch discarded remove patch

@@ -98,7 +98,7 @@  discard block
 block discarded – undo
   {
     // Hard initialise simple types, lazy load more complex ones.
     foreach ($array as $key => $val) {
-      if ( !property_exists($this, $this->keyType($key)) &&
+      if (!property_exists($this, $this->keyType($key)) &&
         property_exists($this, $key)) {
           $this->$key = $val;
           unset($array[$key]);
@@ -254,8 +254,7 @@  discard block
 block discarded – undo
   public function offsetGet($offset)
   {
     return isset($this->$offset) ?
-        $this->$offset :
-        $this->__get($offset);
+        $this->$offset : $this->__get($offset);
   }
 
   public function offsetSet($offset, $value)
@@ -275,12 +274,12 @@  discard block
 block discarded – undo
 
   protected function keyType($key)
   {
-    return $key . "Type";
+    return $key."Type";
   }
 
   protected function dataType($key)
   {
-    return $key . "DataType";
+    return $key."DataType";
   }
 
   public function __isset($key)

Please login to merge, or discard this patch.

google-api-php-client/src/Google/Service/AdExchangeBuyer.php 3 patches

Doc Comments +8 added lines, -8 removed lines patch added patch discarded remove patch

@@ -435,7 +435,7 @@  discard block
 block discarded – undo
    * (accounts.patch)
    *
    * @param int $id The account id
-   * @param Google_Account $postBody
+   * @param Google_Service_AdExchangeBuyer_Account $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Account
    */
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
    * Updates an existing account. (accounts.update)
    *
    * @param int $id The account id
-   * @param Google_Account $postBody
+   * @param Google_Service_AdExchangeBuyer_Account $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Account
    */
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
    * updated.
    * @param string $billingId The billing id associated with the budget being
    * updated.
-   * @param Google_Budget $postBody
+   * @param Google_Service_AdExchangeBuyer_Budget $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Budget
    */
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
    * updated.
    * @param string $billingId The billing id associated with the budget being
    * updated.
-   * @param Google_Budget $postBody
+   * @param Google_Service_AdExchangeBuyer_Budget $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Budget
    */
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
   /**
    * Submit a new creative. (creatives.insert)
    *
-   * @param Google_Creative $postBody
+   * @param Google_Service_AdExchangeBuyer_Creative $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_Creative
    */
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
    *
    * @param string $accountId The account id to insert the pretargeting config
    * for.
-   * @param Google_PretargetingConfig $postBody
+   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_PretargetingConfig
    */
@@ -795,7 +795,7 @@  discard block
 block discarded – undo
    * @param string $accountId The account id to update the pretargeting config
    * for.
    * @param string $configId The specific id of the configuration to update.
-   * @param Google_PretargetingConfig $postBody
+   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_PretargetingConfig
    */
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
    * @param string $accountId The account id to update the pretargeting config
    * for.
    * @param string $configId The specific id of the configuration to update.
-   * @param Google_PretargetingConfig $postBody
+   * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_AdExchangeBuyer_PretargetingConfig
    */

Please login to merge, or discard this patch.

Indentation +652 added lines, -652 removed lines patch added patch discarded remove patch

@@ -33,7 +33,7 @@  discard block
 block discarded – undo
 {
   /** Manage your Ad Exchange buyer account configuration. */
   const ADEXCHANGE_BUYER =
-      "https://www.googleapis.com/auth/adexchange.buyer";
+	  "https://www.googleapis.com/auth/adexchange.buyer";
 
   public $accounts;
   public $billingInfo;
@@ -51,343 +51,343 @@  discard block
 block discarded – undo
    */
   public function __construct(Google_Client $client)
   {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'adexchangebuyer/v1.3/';
-    $this->version = 'v1.3';
-    $this->serviceName = 'adexchangebuyer';
-
-    $this->accounts = new Google_Service_AdExchangeBuyer_Accounts_Resource(
-        $this,
-        $this->serviceName,
-        'accounts',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'accounts',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),'patch' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'accounts/{id}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->billingInfo = new Google_Service_AdExchangeBuyer_BillingInfo_Resource(
-        $this,
-        $this->serviceName,
-        'billingInfo',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'billinginfo/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'billinginfo',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->budget = new Google_Service_AdExchangeBuyer_Budget_Resource(
-        $this,
-        $this->serviceName,
-        'budget',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'billinginfo/{accountId}/{billingId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'billingId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->creatives = new Google_Service_AdExchangeBuyer_Creatives_Resource(
-        $this,
-        $this->serviceName,
-        'creatives',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'creatives/{accountId}/{buyerCreativeId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'integer',
-                  'required' => true,
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'creatives',
-              'httpMethod' => 'POST',
-              'parameters' => array(),
-            ),'list' => array(
-              'path' => 'creatives',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'statusFilter' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-                'buyerCreativeId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'repeated' => true,
-                ),
-                'accountId' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                  'repeated' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->directDeals = new Google_Service_AdExchangeBuyer_DirectDeals_Resource(
-        $this,
-        $this->serviceName,
-        'directDeals',
-        array(
-          'methods' => array(
-            'get' => array(
-              'path' => 'directdeals/{id}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'id' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'directdeals',
-              'httpMethod' => 'GET',
-              'parameters' => array(),
-            ),
-          )
-        )
-    );
-    $this->performanceReport = new Google_Service_AdExchangeBuyer_PerformanceReport_Resource(
-        $this,
-        $this->serviceName,
-        'performanceReport',
-        array(
-          'methods' => array(
-            'list' => array(
-              'path' => 'performancereport',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'endDateTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'startDateTime' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'pageToken' => array(
-                  'location' => 'query',
-                  'type' => 'string',
-                ),
-                'maxResults' => array(
-                  'location' => 'query',
-                  'type' => 'integer',
-                ),
-              ),
-            ),
-          )
-        )
-    );
-    $this->pretargetingConfig = new Google_Service_AdExchangeBuyer_PretargetingConfig_Resource(
-        $this,
-        $this->serviceName,
-        'pretargetingConfig',
-        array(
-          'methods' => array(
-            'delete' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'DELETE',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'get' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'insert' => array(
-              'path' => 'pretargetingconfigs/{accountId}',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'list' => array(
-              'path' => 'pretargetingconfigs/{accountId}',
-              'httpMethod' => 'GET',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'patch' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'PATCH',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),'update' => array(
-              'path' => 'pretargetingconfigs/{accountId}/{configId}',
-              'httpMethod' => 'PUT',
-              'parameters' => array(
-                'accountId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-                'configId' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
+	parent::__construct($client);
+	$this->rootUrl = 'https://www.googleapis.com/';
+	$this->servicePath = 'adexchangebuyer/v1.3/';
+	$this->version = 'v1.3';
+	$this->serviceName = 'adexchangebuyer';
+
+	$this->accounts = new Google_Service_AdExchangeBuyer_Accounts_Resource(
+		$this,
+		$this->serviceName,
+		'accounts',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'accounts/{id}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'accounts',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(),
+			),'patch' => array(
+			  'path' => 'accounts/{id}',
+			  'httpMethod' => 'PATCH',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),'update' => array(
+			  'path' => 'accounts/{id}',
+			  'httpMethod' => 'PUT',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->billingInfo = new Google_Service_AdExchangeBuyer_BillingInfo_Resource(
+		$this,
+		$this->serviceName,
+		'billingInfo',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'billinginfo/{accountId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'billinginfo',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(),
+			),
+		  )
+		)
+	);
+	$this->budget = new Google_Service_AdExchangeBuyer_Budget_Resource(
+		$this,
+		$this->serviceName,
+		'budget',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'billinginfo/{accountId}/{billingId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'billingId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'patch' => array(
+			  'path' => 'billinginfo/{accountId}/{billingId}',
+			  'httpMethod' => 'PATCH',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'billingId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'update' => array(
+			  'path' => 'billinginfo/{accountId}/{billingId}',
+			  'httpMethod' => 'PUT',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'billingId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->creatives = new Google_Service_AdExchangeBuyer_Creatives_Resource(
+		$this,
+		$this->serviceName,
+		'creatives',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'creatives/{accountId}/{buyerCreativeId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'integer',
+				  'required' => true,
+				),
+				'buyerCreativeId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'insert' => array(
+			  'path' => 'creatives',
+			  'httpMethod' => 'POST',
+			  'parameters' => array(),
+			),'list' => array(
+			  'path' => 'creatives',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'statusFilter' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				),
+				'pageToken' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				),
+				'maxResults' => array(
+				  'location' => 'query',
+				  'type' => 'integer',
+				),
+				'buyerCreativeId' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'repeated' => true,
+				),
+				'accountId' => array(
+				  'location' => 'query',
+				  'type' => 'integer',
+				  'repeated' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->directDeals = new Google_Service_AdExchangeBuyer_DirectDeals_Resource(
+		$this,
+		$this->serviceName,
+		'directDeals',
+		array(
+		  'methods' => array(
+			'get' => array(
+			  'path' => 'directdeals/{id}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'id' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'directdeals',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(),
+			),
+		  )
+		)
+	);
+	$this->performanceReport = new Google_Service_AdExchangeBuyer_PerformanceReport_Resource(
+		$this,
+		$this->serviceName,
+		'performanceReport',
+		array(
+		  'methods' => array(
+			'list' => array(
+			  'path' => 'performancereport',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'endDateTime' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'startDateTime' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'pageToken' => array(
+				  'location' => 'query',
+				  'type' => 'string',
+				),
+				'maxResults' => array(
+				  'location' => 'query',
+				  'type' => 'integer',
+				),
+			  ),
+			),
+		  )
+		)
+	);
+	$this->pretargetingConfig = new Google_Service_AdExchangeBuyer_PretargetingConfig_Resource(
+		$this,
+		$this->serviceName,
+		'pretargetingConfig',
+		array(
+		  'methods' => array(
+			'delete' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'DELETE',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'get' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'insert' => array(
+			  'path' => 'pretargetingconfigs/{accountId}',
+			  'httpMethod' => 'POST',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'list' => array(
+			  'path' => 'pretargetingconfigs/{accountId}',
+			  'httpMethod' => 'GET',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'patch' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'PATCH',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),'update' => array(
+			  'path' => 'pretargetingconfigs/{accountId}/{configId}',
+			  'httpMethod' => 'PUT',
+			  'parameters' => array(
+				'accountId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+				'configId' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
   }
 }
 
@@ -412,9 +412,9 @@  discard block
 block discarded – undo
    */
   public function get($id, $optParams = array())
   {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Account");
+	$params = array('id' => $id);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Account");
   }
 
   /**
@@ -425,9 +425,9 @@  discard block
 block discarded – undo
    */
   public function listAccounts($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_AccountsList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_AccountsList");
   }
 
   /**
@@ -441,9 +441,9 @@  discard block
 block discarded – undo
    */
   public function patch($id, Google_Service_AdExchangeBuyer_Account $postBody, $optParams = array())
   {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Account");
+	$params = array('id' => $id, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Account");
   }
 
   /**
@@ -456,9 +456,9 @@  discard block
 block discarded – undo
    */
   public function update($id, Google_Service_AdExchangeBuyer_Account $postBody, $optParams = array())
   {
-    $params = array('id' => $id, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Account");
+	$params = array('id' => $id, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Account");
   }
 }
 
@@ -483,9 +483,9 @@  discard block
 block discarded – undo
    */
   public function get($accountId, $optParams = array())
   {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_BillingInfo");
+	$params = array('accountId' => $accountId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_BillingInfo");
   }
 
   /**
@@ -497,9 +497,9 @@  discard block
 block discarded – undo
    */
   public function listBillingInfo($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_BillingInfoList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_BillingInfoList");
   }
 }
 
@@ -525,9 +525,9 @@  discard block
 block discarded – undo
    */
   public function get($accountId, $billingId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Budget");
+	$params = array('accountId' => $accountId, 'billingId' => $billingId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Budget");
   }
 
   /**
@@ -545,9 +545,9 @@  discard block
 block discarded – undo
    */
   public function patch($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Budget");
+	$params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_Budget");
   }
 
   /**
@@ -565,9 +565,9 @@  discard block
 block discarded – undo
    */
   public function update($accountId, $billingId, Google_Service_AdExchangeBuyer_Budget $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Budget");
+	$params = array('accountId' => $accountId, 'billingId' => $billingId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_Budget");
   }
 }
 
@@ -593,9 +593,9 @@  discard block
 block discarded – undo
    */
   public function get($accountId, $buyerCreativeId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Creative");
+	$params = array('accountId' => $accountId, 'buyerCreativeId' => $buyerCreativeId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_Creative");
   }
 
   /**
@@ -607,9 +607,9 @@  discard block
 block discarded – undo
    */
   public function insert(Google_Service_AdExchangeBuyer_Creative $postBody, $optParams = array())
   {
-    $params = array('postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_Creative");
+	$params = array('postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_Creative");
   }
 
   /**
@@ -633,9 +633,9 @@  discard block
 block discarded – undo
    */
   public function listCreatives($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_CreativesList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_CreativesList");
   }
 }
 
@@ -659,9 +659,9 @@  discard block
 block discarded – undo
    */
   public function get($id, $optParams = array())
   {
-    $params = array('id' => $id);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_DirectDeal");
+	$params = array('id' => $id);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_DirectDeal");
   }
 
   /**
@@ -673,9 +673,9 @@  discard block
 block discarded – undo
    */
   public function listDirectDeals($optParams = array())
   {
-    $params = array();
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_DirectDealsList");
+	$params = array();
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_DirectDealsList");
   }
 }
 
@@ -710,9 +710,9 @@  discard block
 block discarded – undo
    */
   public function listPerformanceReport($accountId, $endDateTime, $startDateTime, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'endDateTime' => $endDateTime, 'startDateTime' => $startDateTime);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PerformanceReportList");
+	$params = array('accountId' => $accountId, 'endDateTime' => $endDateTime, 'startDateTime' => $startDateTime);
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PerformanceReportList");
   }
 }
 
@@ -737,9 +737,9 @@  discard block
 block discarded – undo
    */
   public function delete($accountId, $configId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId);
-    $params = array_merge($params, $optParams);
-    return $this->call('delete', array($params));
+	$params = array('accountId' => $accountId, 'configId' => $configId);
+	$params = array_merge($params, $optParams);
+	return $this->call('delete', array($params));
   }
 
   /**
@@ -752,9 +752,9 @@  discard block
 block discarded – undo
    */
   public function get($accountId, $configId, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId);
-    $params = array_merge($params, $optParams);
-    return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'configId' => $configId);
+	$params = array_merge($params, $optParams);
+	return $this->call('get', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 
   /**
@@ -768,9 +768,9 @@  discard block
 block discarded – undo
    */
   public function insert($accountId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('insert', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 
   /**
@@ -783,9 +783,9 @@  discard block
 block discarded – undo
    */
   public function listPretargetingConfig($accountId, $optParams = array())
   {
-    $params = array('accountId' => $accountId);
-    $params = array_merge($params, $optParams);
-    return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfigList");
+	$params = array('accountId' => $accountId);
+	$params = array_merge($params, $optParams);
+	return $this->call('list', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfigList");
   }
 
   /**
@@ -801,9 +801,9 @@  discard block
 block discarded – undo
    */
   public function patch($accountId, $configId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('patch', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 
   /**
@@ -818,9 +818,9 @@  discard block
 block discarded – undo
    */
   public function update($accountId, $configId, Google_Service_AdExchangeBuyer_PretargetingConfig $postBody, $optParams = array())
   {
-    $params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
+	$params = array('accountId' => $accountId, 'configId' => $configId, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('update', array($params), "Google_Service_AdExchangeBuyer_PretargetingConfig");
   }
 }
 
@@ -845,67 +845,67 @@  discard block
 block discarded – undo
 
   public function setBidderLocation($bidderLocation)
   {
-    $this->bidderLocation = $bidderLocation;
+	$this->bidderLocation = $bidderLocation;
   }
   public function getBidderLocation()
   {
-    return $this->bidderLocation;
+	return $this->bidderLocation;
   }
   public function setCookieMatchingNid($cookieMatchingNid)
   {
-    $this->cookieMatchingNid = $cookieMatchingNid;
+	$this->cookieMatchingNid = $cookieMatchingNid;
   }
   public function getCookieMatchingNid()
   {
-    return $this->cookieMatchingNid;
+	return $this->cookieMatchingNid;
   }
   public function setCookieMatchingUrl($cookieMatchingUrl)
   {
-    $this->cookieMatchingUrl = $cookieMatchingUrl;
+	$this->cookieMatchingUrl = $cookieMatchingUrl;
   }
   public function getCookieMatchingUrl()
   {
-    return $this->cookieMatchingUrl;
+	return $this->cookieMatchingUrl;
   }
   public function setId($id)
   {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId()
   {
-    return $this->id;
+	return $this->id;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setMaximumActiveCreatives($maximumActiveCreatives)
   {
-    $this->maximumActiveCreatives = $maximumActiveCreatives;
+	$this->maximumActiveCreatives = $maximumActiveCreatives;
   }
   public function getMaximumActiveCreatives()
   {
-    return $this->maximumActiveCreatives;
+	return $this->maximumActiveCreatives;
   }
   public function setMaximumTotalQps($maximumTotalQps)
   {
-    $this->maximumTotalQps = $maximumTotalQps;
+	$this->maximumTotalQps = $maximumTotalQps;
   }
   public function getMaximumTotalQps()
   {
-    return $this->maximumTotalQps;
+	return $this->maximumTotalQps;
   }
   public function setNumberActiveCreatives($numberActiveCreatives)
   {
-    $this->numberActiveCreatives = $numberActiveCreatives;
+	$this->numberActiveCreatives = $numberActiveCreatives;
   }
   public function getNumberActiveCreatives()
   {
-    return $this->numberActiveCreatives;
+	return $this->numberActiveCreatives;
   }
 }
 
@@ -920,27 +920,27 @@  discard block
 block discarded – undo
 
   public function setMaximumQps($maximumQps)
   {
-    $this->maximumQps = $maximumQps;
+	$this->maximumQps = $maximumQps;
   }
   public function getMaximumQps()
   {
-    return $this->maximumQps;
+	return $this->maximumQps;
   }
   public function setRegion($region)
   {
-    $this->region = $region;
+	$this->region = $region;
   }
   public function getRegion()
   {
-    return $this->region;
+	return $this->region;
   }
   public function setUrl($url)
   {
-    $this->url = $url;
+	$this->url = $url;
   }
   public function getUrl()
   {
-    return $this->url;
+	return $this->url;
   }
 }
 
@@ -956,19 +956,19 @@  discard block
 block discarded – undo
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -985,35 +985,35 @@  discard block
 block discarded – undo
 
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAccountName($accountName)
   {
-    $this->accountName = $accountName;
+	$this->accountName = $accountName;
   }
   public function getAccountName()
   {
-    return $this->accountName;
+	return $this->accountName;
   }
   public function setBillingId($billingId)
   {
-    $this->billingId = $billingId;
+	$this->billingId = $billingId;
   }
   public function getBillingId()
   {
-    return $this->billingId;
+	return $this->billingId;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1029,19 +1029,19 @@  discard block
 block discarded – undo
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1059,51 +1059,51 @@  discard block
 block discarded – undo
 
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setBillingId($billingId)
   {
-    $this->billingId = $billingId;
+	$this->billingId = $billingId;
   }
   public function getBillingId()
   {
-    return $this->billingId;
+	return $this->billingId;
   }
   public function setBudgetAmount($budgetAmount)
   {
-    $this->budgetAmount = $budgetAmount;
+	$this->budgetAmount = $budgetAmount;
   }
   public function getBudgetAmount()
   {
-    return $this->budgetAmount;
+	return $this->budgetAmount;
   }
   public function setCurrencyCode($currencyCode)
   {
-    $this->currencyCode = $currencyCode;
+	$this->currencyCode = $currencyCode;
   }
   public function getCurrencyCode()
   {
-    return $this->currencyCode;
+	return $this->currencyCode;
   }
   public function setId($id)
   {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId()
   {
-    return $this->id;
+	return $this->id;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1111,7 +1111,7 @@  discard block
 block discarded – undo
 {
   protected $collection_key = 'vendorType';
   protected $internal_gapi_mappings = array(
-        "hTMLSnippet" => "HTMLSnippet",
+		"hTMLSnippet" => "HTMLSnippet",
   );
   public $hTMLSnippet;
   public $accountId;
@@ -1140,163 +1140,163 @@  discard block
 block discarded – undo
 
   public function setHTMLSnippet($hTMLSnippet)
   {
-    $this->hTMLSnippet = $hTMLSnippet;
+	$this->hTMLSnippet = $hTMLSnippet;
   }
   public function getHTMLSnippet()
   {
-    return $this->hTMLSnippet;
+	return $this->hTMLSnippet;
   }
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAdvertiserId($advertiserId)
   {
-    $this->advertiserId = $advertiserId;
+	$this->advertiserId = $advertiserId;
   }
   public function getAdvertiserId()
   {
-    return $this->advertiserId;
+	return $this->advertiserId;
   }
   public function setAdvertiserName($advertiserName)
   {
-    $this->advertiserName = $advertiserName;
+	$this->advertiserName = $advertiserName;
   }
   public function getAdvertiserName()
   {
-    return $this->advertiserName;
+	return $this->advertiserName;
   }
   public function setAgencyId($agencyId)
   {
-    $this->agencyId = $agencyId;
+	$this->agencyId = $agencyId;
   }
   public function getAgencyId()
   {
-    return $this->agencyId;
+	return $this->agencyId;
   }
   public function setAttribute($attribute)
   {
-    $this->attribute = $attribute;
+	$this->attribute = $attribute;
   }
   public function getAttribute()
   {
-    return $this->attribute;
+	return $this->attribute;
   }
   public function setBuyerCreativeId($buyerCreativeId)
   {
-    $this->buyerCreativeId = $buyerCreativeId;
+	$this->buyerCreativeId = $buyerCreativeId;
   }
   public function getBuyerCreativeId()
   {
-    return $this->buyerCreativeId;
+	return $this->buyerCreativeId;
   }
   public function setClickThroughUrl($clickThroughUrl)
   {
-    $this->clickThroughUrl = $clickThroughUrl;
+	$this->clickThroughUrl = $clickThroughUrl;
   }
   public function getClickThroughUrl()
   {
-    return $this->clickThroughUrl;
+	return $this->clickThroughUrl;
   }
   public function setCorrections($corrections)
   {
-    $this->corrections = $corrections;
+	$this->corrections = $corrections;
   }
   public function getCorrections()
   {
-    return $this->corrections;
+	return $this->corrections;
   }
   public function setDisapprovalReasons($disapprovalReasons)
   {
-    $this->disapprovalReasons = $disapprovalReasons;
+	$this->disapprovalReasons = $disapprovalReasons;
   }
   public function getDisapprovalReasons()
   {
-    return $this->disapprovalReasons;
+	return $this->disapprovalReasons;
   }
   public function setFilteringReasons(Google_Service_AdExchangeBuyer_CreativeFilteringReasons $filteringReasons)
   {
-    $this->filteringReasons = $filteringReasons;
+	$this->filteringReasons = $filteringReasons;
   }
   public function getFilteringReasons()
   {
-    return $this->filteringReasons;
+	return $this->filteringReasons;
   }
   public function setHeight($height)
   {
-    $this->height = $height;
+	$this->height = $height;
   }
   public function getHeight()
   {
-    return $this->height;
+	return $this->height;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setProductCategories($productCategories)
   {
-    $this->productCategories = $productCategories;
+	$this->productCategories = $productCategories;
   }
   public function getProductCategories()
   {
-    return $this->productCategories;
+	return $this->productCategories;
   }
   public function setRestrictedCategories($restrictedCategories)
   {
-    $this->restrictedCategories = $restrictedCategories;
+	$this->restrictedCategories = $restrictedCategories;
   }
   public function getRestrictedCategories()
   {
-    return $this->restrictedCategories;
+	return $this->restrictedCategories;
   }
   public function setSensitiveCategories($sensitiveCategories)
   {
-    $this->sensitiveCategories = $sensitiveCategories;
+	$this->sensitiveCategories = $sensitiveCategories;
   }
   public function getSensitiveCategories()
   {
-    return $this->sensitiveCategories;
+	return $this->sensitiveCategories;
   }
   public function setStatus($status)
   {
-    $this->status = $status;
+	$this->status = $status;
   }
   public function getStatus()
   {
-    return $this->status;
+	return $this->status;
   }
   public function setVendorType($vendorType)
   {
-    $this->vendorType = $vendorType;
+	$this->vendorType = $vendorType;
   }
   public function getVendorType()
   {
-    return $this->vendorType;
+	return $this->vendorType;
   }
   public function setVideoURL($videoURL)
   {
-    $this->videoURL = $videoURL;
+	$this->videoURL = $videoURL;
   }
   public function getVideoURL()
   {
-    return $this->videoURL;
+	return $this->videoURL;
   }
   public function setWidth($width)
   {
-    $this->width = $width;
+	$this->width = $width;
   }
   public function getWidth()
   {
-    return $this->width;
+	return $this->width;
   }
 }
 
@@ -1311,19 +1311,19 @@  discard block
 block discarded – undo
 
   public function setDetails($details)
   {
-    $this->details = $details;
+	$this->details = $details;
   }
   public function getDetails()
   {
-    return $this->details;
+	return $this->details;
   }
   public function setReason($reason)
   {
-    $this->reason = $reason;
+	$this->reason = $reason;
   }
   public function getReason()
   {
-    return $this->reason;
+	return $this->reason;
   }
 }
 
@@ -1338,19 +1338,19 @@  discard block
 block discarded – undo
 
   public function setDetails($details)
   {
-    $this->details = $details;
+	$this->details = $details;
   }
   public function getDetails()
   {
-    return $this->details;
+	return $this->details;
   }
   public function setReason($reason)
   {
-    $this->reason = $reason;
+	$this->reason = $reason;
   }
   public function getReason()
   {
-    return $this->reason;
+	return $this->reason;
   }
 }
 
@@ -1366,19 +1366,19 @@  discard block
 block discarded – undo
 
   public function setDate($date)
   {
-    $this->date = $date;
+	$this->date = $date;
   }
   public function getDate()
   {
-    return $this->date;
+	return $this->date;
   }
   public function setReasons($reasons)
   {
-    $this->reasons = $reasons;
+	$this->reasons = $reasons;
   }
   public function getReasons()
   {
-    return $this->reasons;
+	return $this->reasons;
   }
 }
 
@@ -1392,19 +1392,19 @@  discard block
 block discarded – undo
 
   public function setFilteringCount($filteringCount)
   {
-    $this->filteringCount = $filteringCount;
+	$this->filteringCount = $filteringCount;
   }
   public function getFilteringCount()
   {
-    return $this->filteringCount;
+	return $this->filteringCount;
   }
   public function setFilteringStatus($filteringStatus)
   {
-    $this->filteringStatus = $filteringStatus;
+	$this->filteringStatus = $filteringStatus;
   }
   public function getFilteringStatus()
   {
-    return $this->filteringStatus;
+	return $this->filteringStatus;
   }
 }
 
@@ -1421,27 +1421,27 @@  discard block
 block discarded – undo
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setNextPageToken($nextPageToken)
   {
-    $this->nextPageToken = $nextPageToken;
+	$this->nextPageToken = $nextPageToken;
   }
   public function getNextPageToken()
   {
-    return $this->nextPageToken;
+	return $this->nextPageToken;
   }
 }
 
@@ -1465,99 +1465,99 @@  discard block
 block discarded – undo
 
   public function setAccountId($accountId)
   {
-    $this->accountId = $accountId;
+	$this->accountId = $accountId;
   }
   public function getAccountId()
   {
-    return $this->accountId;
+	return $this->accountId;
   }
   public function setAdvertiser($advertiser)
   {
-    $this->advertiser = $advertiser;
+	$this->advertiser = $advertiser;
   }
   public function getAdvertiser()
   {
-    return $this->advertiser;
+	return $this->advertiser;
   }
   public function setCurrencyCode($currencyCode)
   {
-    $this->currencyCode = $currencyCode;
+	$this->currencyCode = $currencyCode;
   }
   public function getCurrencyCode()
   {
-    return $this->currencyCode;
+	return $this->currencyCode;
   }
   public function setEndTime($endTime)
   {
-    $this->endTime = $endTime;
+	$this->endTime = $endTime;
   }
   public function getEndTime()
   {
-    return $this->endTime;
+	return $this->endTime;
   }
   public function setFixedCpm($fixedCpm)
   {
-    $this->fixedCpm = $fixedCpm;
+	$this->fixedCpm = $fixedCpm;
   }
   public function getFixedCpm()
   {
-    return $this->fixedCpm;
+	return $this->fixedCpm;
   }
   public function setId($id)
   {
-    $this->id = $id;
+	$this->id = $id;
   }
   public function getId()
   {
-    return $this->id;
+	return $this->id;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setName($name)
   {
-    $this->name = $name;
+	$this->name = $name;
   }
   public function getName()
   {
-    return $this->name;
+	return $this->name;
   }
   public function setPrivateExchangeMinCpm($privateExchangeMinCpm)
   {
-    $this->privateExchangeMinCpm = $privateExchangeMinCpm;
+	$this->privateExchangeMinCpm = $privateExchangeMinCpm;
   }
   public function getPrivateExchangeMinCpm()
   {
-    return $this->privateExchangeMinCpm;
+	return $this->privateExchangeMinCpm;
   }
   public function setPublisherBlocksOverriden($publisherBlocksOverriden)
   {
-    $this->publisherBlocksOverriden = $publisherBlocksOverriden;
+	$this->publisherBlocksOverriden = $publisherBlocksOverriden;
   }
   public function getPublisherBlocksOverriden()
   {
-    return $this->publisherBlocksOverriden;
+	return $this->publisherBlocksOverriden;
   }
   public function setSellerNetwork($sellerNetwork)
   {
-    $this->sellerNetwork = $sellerNetwork;
+	$this->sellerNetwork = $sellerNetwork;
   }
   public function getSellerNetwork()
   {
-    return $this->sellerNetwork;
+	return $this->sellerNetwork;
   }
   public function setStartTime($startTime)
   {
-    $this->startTime = $startTime;
+	$this->startTime = $startTime;
   }
   public function getStartTime()
   {
-    return $this->startTime;
+	return $this->startTime;
   }
 }
 
@@ -1573,19 +1573,19 @@  discard block
 block discarded – undo
 
   public function setDirectDeals($directDeals)
   {
-    $this->directDeals = $directDeals;
+	$this->directDeals = $directDeals;
   }
   public function getDirectDeals()
   {
-    return $this->directDeals;
+	return $this->directDeals;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -1620,179 +1620,179 @@  discard block
 block discarded – undo
 
   public function setBidRate($bidRate)
   {
-    $this->bidRate = $bidRate;
+	$this->bidRate = $bidRate;
   }
   public function getBidRate()
   {
-    return $this->bidRate;
+	return $this->bidRate;
   }
   public function setBidRequestRate($bidRequestRate)
   {
-    $this->bidRequestRate = $bidRequestRate;
+	$this->bidRequestRate = $bidRequestRate;
   }
   public function getBidRequestRate()
   {
-    return $this->bidRequestRate;
+	return $this->bidRequestRate;
   }
   public function setCalloutStatusRate($calloutStatusRate)
   {
-    $this->calloutStatusRate = $calloutStatusRate;
+	$this->calloutStatusRate = $calloutStatusRate;
   }
   public function getCalloutStatusRate()
   {
-    return $this->calloutStatusRate;
+	return $this->calloutStatusRate;
   }
   public function setCookieMatcherStatusRate($cookieMatcherStatusRate)
   {
-    $this->cookieMatcherStatusRate = $cookieMatcherStatusRate;
+	$this->cookieMatcherStatusRate = $cookieMatcherStatusRate;
   }
   public function getCookieMatcherStatusRate()
   {
-    return $this->cookieMatcherStatusRate;
+	return $this->cookieMatcherStatusRate;
   }
   public function setCreativeStatusRate($creativeStatusRate)
   {
-    $this->creativeStatusRate = $creativeStatusRate;
+	$this->creativeStatusRate = $creativeStatusRate;
   }
   public function getCreativeStatusRate()
   {
-    return $this->creativeStatusRate;
+	return $this->creativeStatusRate;
   }
   public function setFilteredBidRate($filteredBidRate)
   {
-    $this->filteredBidRate = $filteredBidRate;
+	$this->filteredBidRate = $filteredBidRate;
   }
   public function getFilteredBidRate()
   {
-    return $this->filteredBidRate;
+	return $this->filteredBidRate;
   }
   public function setHostedMatchStatusRate($hostedMatchStatusRate)
   {
-    $this->hostedMatchStatusRate = $hostedMatchStatusRate;
+	$this->hostedMatchStatusRate = $hostedMatchStatusRate;
   }
   public function getHostedMatchStatusRate()
   {
-    return $this->hostedMatchStatusRate;
+	return $this->hostedMatchStatusRate;
   }
   public function setInventoryMatchRate($inventoryMatchRate)
   {
-    $this->inventoryMatchRate = $inventoryMatchRate;
+	$this->inventoryMatchRate = $inventoryMatchRate;
   }
   public function getInventoryMatchRate()
   {
-    return $this->inventoryMatchRate;
+	return $this->inventoryMatchRate;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setLatency50thPercentile($latency50thPercentile)
   {
-    $this->latency50thPercentile = $latency50thPercentile;
+	$this->latency50thPercentile = $latency50thPercentile;
   }
   public function getLatency50thPercentile()
   {
-    return $this->latency50thPercentile;
+	return $this->latency50thPercentile;
   }
   public function setLatency85thPercentile($latency85thPercentile)
   {
-    $this->latency85thPercentile = $latency85thPercentile;
+	$this->latency85thPercentile = $latency85thPercentile;
   }
   public function getLatency85thPercentile()
   {
-    return $this->latency85thPercentile;
+	return $this->latency85thPercentile;
   }
   public function setLatency95thPercentile($latency95thPercentile)
   {
-    $this->latency95thPercentile = $latency95thPercentile;
+	$this->latency95thPercentile = $latency95thPercentile;
   }
   public function getLatency95thPercentile()
   {
-    return $this->latency95thPercentile;
+	return $this->latency95thPercentile;
   }
   public function setNoQuotaInRegion($noQuotaInRegion)
   {
-    $this->noQuotaInRegion = $noQuotaInRegion;
+	$this->noQuotaInRegion = $noQuotaInRegion;
   }
   public function getNoQuotaInRegion()
   {
-    return $this->noQuotaInRegion;
+	return $this->noQuotaInRegion;
   }
   public function setOutOfQuota($outOfQuota)
   {
-    $this->outOfQuota = $outOfQuota;
+	$this->outOfQuota = $outOfQuota;
   }
   public function getOutOfQuota()
   {
-    return $this->outOfQuota;
+	return $this->outOfQuota;
   }
   public function setPixelMatchRequests($pixelMatchRequests)
   {
-    $this->pixelMatchRequests = $pixelMatchRequests;
+	$this->pixelMatchRequests = $pixelMatchRequests;
   }
   public function getPixelMatchRequests()
   {
-    return $this->pixelMatchRequests;
+	return $this->pixelMatchRequests;
   }
   public function setPixelMatchResponses($pixelMatchResponses)
   {
-    $this->pixelMatchResponses = $pixelMatchResponses;
+	$this->pixelMatchResponses = $pixelMatchResponses;
   }
   public function getPixelMatchResponses()
   {
-    return $this->pixelMatchResponses;
+	return $this->pixelMatchResponses;
   }
   public function setQuotaConfiguredLimit($quotaConfiguredLimit)
   {
-    $this->quotaConfiguredLimit = $quotaConfiguredLimit;
+	$this->quotaConfiguredLimit = $quotaConfiguredLimit;
   }
   public function getQuotaConfiguredLimit()
   {
-    return $this->quotaConfiguredLimit;
+	return $this->quotaConfiguredLimit;
   }
   public function setQuotaThrottledLimit($quotaThrottledLimit)
   {
-    $this->quotaThrottledLimit = $quotaThrottledLimit;
+	$this->quotaThrottledLimit = $quotaThrottledLimit;
   }
   public function getQuotaThrottledLimit()
   {
-    return $this->quotaThrottledLimit;
+	return $this->quotaThrottledLimit;
   }
   public function setRegion($region)
   {
-    $this->region = $region;
+	$this->region = $region;
   }
   public function getRegion()
   {
-    return $this->region;
+	return $this->region;
   }
   public function setSuccessfulRequestRate($successfulRequestRate)
   {
-    $this->successfulRequestRate = $successfulRequestRate;
+	$this->successfulRequestRate = $successfulRequestRate;
   }
   public function getSuccessfulRequestRate()
   {
-    return $this->successfulRequestRate;
+	return $this->successfulRequestRate;
   }
   public function setTimestamp($timestamp)
   {
-    $this->timestamp = $timestamp;
+	$this->timestamp = $timestamp;
   }
   public function getTimestamp()
   {
-    return $this->timestamp;
+	return $this->timestamp;
   }
   public function setUnsuccessfulRequestRate($unsuccessfulRequestRate)
   {
-    $this->unsuccessfulRequestRate = $unsuccessfulRequestRate;
+	$this->unsuccessfulRequestRate = $unsuccessfulRequestRate;
   }
   public function getUnsuccessfulRequestRate()
   {
-    return $this->unsuccessfulRequestRate;
+	return $this->unsuccessfulRequestRate;
   }
 }
 
@@ -1808,19 +1808,19 @@  discard block
 block discarded – undo
 
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setPerformanceReport($performanceReport)
   {
-    $this->performanceReport = $performanceReport;
+	$this->performanceReport = $performanceReport;
   }
   public function getPerformanceReport()
   {
-    return $this->performanceReport;
+	return $this->performanceReport;
   }
 }
 
@@ -1859,187 +1859,187 @@  discard block
 block discarded – undo
 
   public function setBillingId($billingId)
   {
-    $this->billingId = $billingId;
+	$this->billingId = $billingId;
   }
   public function getBillingId()
   {
-    return $this->billingId;
+	return $this->billingId;
   }
   public function setConfigId($configId)
   {
-    $this->configId = $configId;
+	$this->configId = $configId;
   }
   public function getConfigId()
   {
-    return $this->configId;
+	return $this->configId;
   }
   public function setConfigName($configName)
   {
-    $this->configName = $configName;
+	$this->configName = $configName;
   }
   public function getConfigName()
   {
-    return $this->configName;
+	return $this->configName;
   }
   public function setCreativeType($creativeType)
   {
-    $this->creativeType = $creativeType;
+	$this->creativeType = $creativeType;
   }
   public function getCreativeType()
   {
-    return $this->creativeType;
+	return $this->creativeType;
   }
   public function setDimensions($dimensions)
   {
-    $this->dimensions = $dimensions;
+	$this->dimensions = $dimensions;
   }
   public function getDimensions()
   {
-    return $this->dimensions;
+	return $this->dimensions;
   }
   public function setExcludedContentLabels($excludedContentLabels)
   {
-    $this->excludedContentLabels = $excludedContentLabels;
+	$this->excludedContentLabels = $excludedContentLabels;
   }
   public function getExcludedContentLabels()
   {
-    return $this->excludedContentLabels;
+	return $this->excludedContentLabels;
   }
   public function setExcludedGeoCriteriaIds($excludedGeoCriteriaIds)
   {
-    $this->excludedGeoCriteriaIds = $excludedGeoCriteriaIds;
+	$this->excludedGeoCriteriaIds = $excludedGeoCriteriaIds;
   }
   public function getExcludedGeoCriteriaIds()
   {
-    return $this->excludedGeoCriteriaIds;
+	return $this->excludedGeoCriteriaIds;
   }
   public function setExcludedPlacements($excludedPlacements)
   {
-    $this->excludedPlacements = $excludedPlacements;
+	$this->excludedPlacements = $excludedPlacements;
   }
   public function getExcludedPlacements()
   {
-    return $this->excludedPlacements;
+	return $this->excludedPlacements;
   }
   public function setExcludedUserLists($excludedUserLists)
   {
-    $this->excludedUserLists = $excludedUserLists;
+	$this->excludedUserLists = $excludedUserLists;
   }
   public function getExcludedUserLists()
   {
-    return $this->excludedUserLists;
+	return $this->excludedUserLists;
   }
   public function setExcludedVerticals($excludedVerticals)
   {
-    $this->excludedVerticals = $excludedVerticals;
+	$this->excludedVerticals = $excludedVerticals;
   }
   public function getExcludedVerticals()
   {
-    return $this->excludedVerticals;
+	return $this->excludedVerticals;
   }
   public function setGeoCriteriaIds($geoCriteriaIds)
   {
-    $this->geoCriteriaIds = $geoCriteriaIds;
+	$this->geoCriteriaIds = $geoCriteriaIds;
   }
   public function getGeoCriteriaIds()
   {
-    return $this->geoCriteriaIds;
+	return $this->geoCriteriaIds;
   }
   public function setIsActive($isActive)
   {
-    $this->isActive = $isActive;
+	$this->isActive = $isActive;
   }
   public function getIsActive()
   {
-    return $this->isActive;
+	return $this->isActive;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setLanguages($languages)
   {
-    $this->languages = $languages;
+	$this->languages = $languages;
   }
   public function getLanguages()
   {
-    return $this->languages;
+	return $this->languages;
   }
   public function setMobileCarriers($mobileCarriers)
   {
-    $this->mobileCarriers = $mobileCarriers;
+	$this->mobileCarriers = $mobileCarriers;
   }
   public function getMobileCarriers()
   {
-    return $this->mobileCarriers;
+	return $this->mobileCarriers;
   }
   public function setMobileDevices($mobileDevices)
   {
-    $this->mobileDevices = $mobileDevices;
+	$this->mobileDevices = $mobileDevices;
   }
   public function getMobileDevices()
   {
-    return $this->mobileDevices;
+	return $this->mobileDevices;
   }
   public function setMobileOperatingSystemVersions($mobileOperatingSystemVersions)
   {
-    $this->mobileOperatingSystemVersions = $mobileOperatingSystemVersions;
+	$this->mobileOperatingSystemVersions = $mobileOperatingSystemVersions;
   }
   public function getMobileOperatingSystemVersions()
   {
-    return $this->mobileOperatingSystemVersions;
+	return $this->mobileOperatingSystemVersions;
   }
   public function setPlacements($placements)
   {
-    $this->placements = $placements;
+	$this->placements = $placements;
   }
   public function getPlacements()
   {
-    return $this->placements;
+	return $this->placements;
   }
   public function setPlatforms($platforms)
   {
-    $this->platforms = $platforms;
+	$this->platforms = $platforms;
   }
   public function getPlatforms()
   {
-    return $this->platforms;
+	return $this->platforms;
   }
   public function setSupportedCreativeAttributes($supportedCreativeAttributes)
   {
-    $this->supportedCreativeAttributes = $supportedCreativeAttributes;
+	$this->supportedCreativeAttributes = $supportedCreativeAttributes;
   }
   public function getSupportedCreativeAttributes()
   {
-    return $this->supportedCreativeAttributes;
+	return $this->supportedCreativeAttributes;
   }
   public function setUserLists($userLists)
   {
-    $this->userLists = $userLists;
+	$this->userLists = $userLists;
   }
   public function getUserLists()
   {
-    return $this->userLists;
+	return $this->userLists;
   }
   public function setVendorTypes($vendorTypes)
   {
-    $this->vendorTypes = $vendorTypes;
+	$this->vendorTypes = $vendorTypes;
   }
   public function getVendorTypes()
   {
-    return $this->vendorTypes;
+	return $this->vendorTypes;
   }
   public function setVerticals($verticals)
   {
-    $this->verticals = $verticals;
+	$this->verticals = $verticals;
   }
   public function getVerticals()
   {
-    return $this->verticals;
+	return $this->verticals;
   }
 }
 
@@ -2053,19 +2053,19 @@  discard block
 block discarded – undo
 
   public function setHeight($height)
   {
-    $this->height = $height;
+	$this->height = $height;
   }
   public function getHeight()
   {
-    return $this->height;
+	return $this->height;
   }
   public function setWidth($width)
   {
-    $this->width = $width;
+	$this->width = $width;
   }
   public function getWidth()
   {
-    return $this->width;
+	return $this->width;
   }
 }
 
@@ -2079,19 +2079,19 @@  discard block
 block discarded – undo
 
   public function setToken($token)
   {
-    $this->token = $token;
+	$this->token = $token;
   }
   public function getToken()
   {
-    return $this->token;
+	return $this->token;
   }
   public function setType($type)
   {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType()
   {
-    return $this->type;
+	return $this->type;
   }
 }
 
@@ -2107,19 +2107,19 @@  discard block
 block discarded – undo
 
   public function setItems($items)
   {
-    $this->items = $items;
+	$this->items = $items;
   }
   public function getItems()
   {
-    return $this->items;
+	return $this->items;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
 }
 
@@ -2133,18 +2133,18 @@  discard block
 block discarded – undo
 
   public function setToken($token)
   {
-    $this->token = $token;
+	$this->token = $token;
   }
   public function getToken()
   {
-    return $this->token;
+	return $this->token;
   }
   public function setType($type)
   {
-    $this->type = $type;
+	$this->type = $type;
   }
   public function getType()
   {
-    return $this->type;
+	return $this->type;
   }
 }

Please login to merge, or discard this patch.

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -73,11 +73,11 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'accounts',
               'httpMethod' => 'GET',
               'parameters' => array(),
-            ),'patch' => array(
+            ), 'patch' => array(
               'path' => 'accounts/{id}',
               'httpMethod' => 'PATCH',
               'parameters' => array(
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'update' => array(
+            ), 'update' => array(
               'path' => 'accounts/{id}',
               'httpMethod' => 'PUT',
               'parameters' => array(
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'billinginfo',
               'httpMethod' => 'GET',
               'parameters' => array(),
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'patch' => array(
+            ), 'patch' => array(
               'path' => 'billinginfo/{accountId}/{billingId}',
               'httpMethod' => 'PATCH',
               'parameters' => array(
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'update' => array(
+            ), 'update' => array(
               'path' => 'billinginfo/{accountId}/{billingId}',
               'httpMethod' => 'PUT',
               'parameters' => array(
@@ -201,11 +201,11 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'insert' => array(
+            ), 'insert' => array(
               'path' => 'creatives',
               'httpMethod' => 'POST',
               'parameters' => array(),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'creatives',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'directdeals',
               'httpMethod' => 'GET',
               'parameters' => array(),
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'get' => array(
+            ), 'get' => array(
               'path' => 'pretargetingconfigs/{accountId}/{configId}',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -334,7 +334,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'insert' => array(
+            ), 'insert' => array(
               'path' => 'pretargetingconfigs/{accountId}',
               'httpMethod' => 'POST',
               'parameters' => array(
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'list' => array(
+            ), 'list' => array(
               'path' => 'pretargetingconfigs/{accountId}',
               'httpMethod' => 'GET',
               'parameters' => array(
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'patch' => array(
+            ), 'patch' => array(
               'path' => 'pretargetingconfigs/{accountId}/{configId}',
               'httpMethod' => 'PATCH',
               'parameters' => array(
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
                   'required' => true,
                 ),
               ),
-            ),'update' => array(
+            ), 'update' => array(
               'path' => 'pretargetingconfigs/{accountId}/{configId}',
               'httpMethod' => 'PUT',
               'parameters' => array(

Please login to merge, or discard this patch.

geodirectory-admin/google-api-php-client/src/Google/Service/Admin.php 2 patches

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -89,7 +89,7 @@
 block discarded – undo
    * Insert Mail into Google's Gmail backends (mail.insert)
    *
    * @param string $userKey The email or immutable id of the user
-   * @param Google_MailItem $postBody
+   * @param Google_Service_Admin_MailItem $postBody
    * @param array $optParams Optional parameters.
    */
   public function insert($userKey, Google_Service_Admin_MailItem $postBody, $optParams = array())

Please login to merge, or discard this patch.

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
 {
   /** Manage email messages of users on your domain. */
   const EMAIL_MIGRATION =
-      "https://www.googleapis.com/auth/email.migration";
+	  "https://www.googleapis.com/auth/email.migration";
 
   public $mail;
   
@@ -44,32 +44,32 @@  discard block
 block discarded – undo
    */
   public function __construct(Google_Client $client)
   {
-    parent::__construct($client);
-    $this->rootUrl = 'https://www.googleapis.com/';
-    $this->servicePath = 'email/v2/users/';
-    $this->version = 'email_migration_v2';
-    $this->serviceName = 'admin';
+	parent::__construct($client);
+	$this->rootUrl = 'https://www.googleapis.com/';
+	$this->servicePath = 'email/v2/users/';
+	$this->version = 'email_migration_v2';
+	$this->serviceName = 'admin';
 
-    $this->mail = new Google_Service_Admin_Mail_Resource(
-        $this,
-        $this->serviceName,
-        'mail',
-        array(
-          'methods' => array(
-            'insert' => array(
-              'path' => '{userKey}/mail',
-              'httpMethod' => 'POST',
-              'parameters' => array(
-                'userKey' => array(
-                  'location' => 'path',
-                  'type' => 'string',
-                  'required' => true,
-                ),
-              ),
-            ),
-          )
-        )
-    );
+	$this->mail = new Google_Service_Admin_Mail_Resource(
+		$this,
+		$this->serviceName,
+		'mail',
+		array(
+		  'methods' => array(
+			'insert' => array(
+			  'path' => '{userKey}/mail',
+			  'httpMethod' => 'POST',
+			  'parameters' => array(
+				'userKey' => array(
+				  'location' => 'path',
+				  'type' => 'string',
+				  'required' => true,
+				),
+			  ),
+			),
+		  )
+		)
+	);
   }
 }
 
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
    */
   public function insert($userKey, Google_Service_Admin_MailItem $postBody, $optParams = array())
   {
-    $params = array('userKey' => $userKey, 'postBody' => $postBody);
-    $params = array_merge($params, $optParams);
-    return $this->call('insert', array($params));
+	$params = array('userKey' => $userKey, 'postBody' => $postBody);
+	$params = array_merge($params, $optParams);
+	return $this->call('insert', array($params));
   }
 }
 
@@ -121,74 +121,74 @@  discard block
 block discarded – undo
 
   public function setIsDeleted($isDeleted)
   {
-    $this->isDeleted = $isDeleted;
+	$this->isDeleted = $isDeleted;
   }
   public function getIsDeleted()
   {
-    return $this->isDeleted;
+	return $this->isDeleted;
   }
   public function setIsDraft($isDraft)
   {
-    $this->isDraft = $isDraft;
+	$this->isDraft = $isDraft;
   }
   public function getIsDraft()
   {
-    return $this->isDraft;
+	return $this->isDraft;
   }
   public function setIsInbox($isInbox)
   {
-    $this->isInbox = $isInbox;
+	$this->isInbox = $isInbox;
   }
   public function getIsInbox()
   {
-    return $this->isInbox;
+	return $this->isInbox;
   }
   public function setIsSent($isSent)
   {
-    $this->isSent = $isSent;
+	$this->isSent = $isSent;
   }
   public function getIsSent()
   {
-    return $this->isSent;
+	return $this->isSent;
   }
   public function setIsStarred($isStarred)
   {
-    $this->isStarred = $isStarred;
+	$this->isStarred = $isStarred;
   }
   public function getIsStarred()
   {
-    return $this->isStarred;
+	return $this->isStarred;
   }
   public function setIsTrash($isTrash)
   {
-    $this->isTrash = $isTrash;
+	$this->isTrash = $isTrash;
   }
   public function getIsTrash()
   {
-    return $this->isTrash;
+	return $this->isTrash;
   }
   public function setIsUnread($isUnread)
   {
-    $this->isUnread = $isUnread;
+	$this->isUnread = $isUnread;
   }
   public function getIsUnread()
   {
-    return $this->isUnread;
+	return $this->isUnread;
   }
   public function setKind($kind)
   {
-    $this->kind = $kind;
+	$this->kind = $kind;
   }
   public function getKind()
   {
-    return $this->kind;
+	return $this->kind;
   }
   public function setLabels($labels)
   {
-    $this->labels = $labels;
+	$this->labels = $labels;
   }
   public function getLabels()
   {
-    return $this->labels;
+	return $this->labels;
   }
 }

Please login to merge, or discard this patch.

		@@ -44,7 +44,7 @@ discard block
		block discarded – undo
44	44	*/
45	45	function geodir_on_wp()
46	46	{
47		- if(geodir_is_page('login')) {
	47	+ if (geodir_is_page('login')) {
48	48	geodir_user_signup();
49	49	}
50	50
		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82	* @since 1.0.0
83	83	* @package GeoDirectory
84	84	*/
85		- include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
	85	+ include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
86	86	die;
87	87	}
88	88
		@@ -104,7 +104,7 @@ discard block
		block discarded – undo
104	104	* @todo check if nonce is required here and if so add one.
105	105	*/
106	106	function geodir_ajax_handler() {
107		- global $wpdb, $gd_session,$post;
	107	+ global $wpdb, $gd_session, $post;
108	108
109	109	if (isset($_REQUEST['gd_listing_view']) && $_REQUEST['gd_listing_view'] != '') {
110	110	$gd_session->set('gd_listing_view', $_REQUEST['gd_listing_view']);
		@@ -126,7 +126,7 @@ discard block
		block discarded – undo
126	126	* @since 1.0.0
127	127	* @package GeoDirectory
128	128	*/
129		- include_once(geodir_plugin_path() . '/geodirectory-admin/geodir_admin_ajax.php');
	129	+ include_once(geodir_plugin_path().'/geodirectory-admin/geodir_admin_ajax.php');
130	130	} else {
131	131	wp_redirect(geodir_login_url());
132	132	gd_die();
		@@ -151,7 +151,7 @@ discard block
		block discarded – undo
151	151	* @param string $posttype The post type to insert.
152	152	* @param string $datatype The type of dummy data to insert.
153	153	*/
154		- do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
	154	+ do_action('geodir_delete_dummy_posts', sanitize_key($_REQUEST['posttype']), $datatype);
155	155	break;
156	156	case "geodir_dummy_insert" :
157	157	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
		@@ -163,7 +163,7 @@ discard block
		block discarded – undo
163	163	$city_bound_lat2 = $_REQUEST['city_bound_lat2'];
164	164	$city_bound_lng2 = $_REQUEST['city_bound_lng2'];
165	165
166		- if (isset($_REQUEST['posttype'])){
	166	+ if (isset($_REQUEST['posttype'])) {
167	167	/**
168	168	* Used to insert the dummy post data per post type.
169	169	*
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	* @param string $datatype The type of dummy data to insert.
175	175	* @param int $post_index The item number to insert.
176	176	*/
177		- do_action('geodir_insert_dummy_posts',sanitize_key($_REQUEST['posttype']),sanitize_key($_REQUEST['datatype']),absint($_REQUEST['insert_dummy_post_index']));
	177	+ do_action('geodir_insert_dummy_posts', sanitize_key($_REQUEST['posttype']), sanitize_key($_REQUEST['datatype']), absint($_REQUEST['insert_dummy_post_index']));
178	178	}
179	179
180	180
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	if ($_REQUEST['popuptype'] == 'b_send_inquiry' \|\| $_REQUEST['popuptype'] == 'b_sendtofriend') {
192	192	$template = locate_template(array("geodirectory/popup-forms.php"));
193	193	if (!$template) {
194		- $template = geodir_plugin_path() . '/geodirectory-templates/popup-forms.php';
	194	+ $template = geodir_plugin_path().'/geodirectory-templates/popup-forms.php';
195	195	}
196	196	require_once($template);
197	197	}
		@@ -210,17 +210,17 @@ discard block
		block discarded – undo
210	210	* @since 1.0.0
211	211	* @package GeoDirectory
212	212	*/
213		- include_once(geodir_plugin_path() . '/geodirectory-functions/map-functions/get_markers.php');
	213	+ include_once(geodir_plugin_path().'/geodirectory-functions/map-functions/get_markers.php');
214	214	}
215	215
216	216	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'favorite') {
217	217	if (is_user_logged_in()) {
218	218	switch ($_REQUEST['ajax_action']):
219	219	case "add" :
220		- geodir_add_to_favorite((int)$_REQUEST['pid']);
	220	+ geodir_add_to_favorite((int) $_REQUEST['pid']);
221	221	break;
222	222	case "remove" :
223		- geodir_remove_from_favorite((int)$_REQUEST['pid']);
	223	+ geodir_remove_from_favorite((int) $_REQUEST['pid']);
224	224	break;
225	225	endswitch;
226	226	} else {
		@@ -233,7 +233,7 @@ discard block
		block discarded – undo
233	233
234	234	$is_current_user_owner = true;
235	235	if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
236		- $is_current_user_owner = geodir_listing_belong_to_current_user((int)$_REQUEST['pid']);
	236	+ $is_current_user_owner = geodir_listing_belong_to_current_user((int) $_REQUEST['pid']);
237	237	}
238	238
239	239	$request = $gd_session->get('listing');
		@@ -344,7 +344,7 @@ discard block
		block discarded – undo
344	344	* @since 1.0.0
345	345	* @package GeoDirectory
346	346	*/
347		- include_once(geodir_plugin_path() . '/geodirectory-functions/geodirectory_reg.php');
	347	+ include_once(geodir_plugin_path().'/geodirectory-functions/geodirectory_reg.php');
348	348	}
349	349
350	350	if (isset($_REQUEST['ajax_action']) && $_REQUEST['ajax_action'] == 'geodir_get_term_list') {
		@@ -375,7 +375,7 @@ discard block
		block discarded – undo
375	375	}
376	376
377	377
378		-function geodir_show_ga_stats(){
	378	+function geodir_show_ga_stats() {
379	379	if (isset($_REQUEST['ga_start'])) {
380	380	$ga_start = $_REQUEST['ga_start'];
381	381	} else {
		@@ -389,5 +389,5 @@ discard block
		block discarded – undo
389	389	geodir_getGoogleAnalytics($_REQUEST['ga_page'], $ga_start, $ga_end);
390	390	die;
391	391	}
392		-add_action( 'wp_ajax_gdga', 'geodir_show_ga_stats' );
393		-add_action( 'wp_ajax_nopriv_gdga', 'geodir_show_ga_stats' );
394	392	\ No newline at end of file
	393	+add_action('wp_ajax_gdga', 'geodir_show_ga_stats');
	394	+add_action('wp_ajax_nopriv_gdga', 'geodir_show_ga_stats');
395	395	\ No newline at end of file

		@@ -112,10 +112,11 @@ discard block
		block discarded – undo
112	112	}
113	113
114	114	if (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'category_ajax') {
115		- if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude']))
116		- geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
117		- else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax']))
118		- geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
	115	+ if (isset($_REQUEST['main_catid']) && isset($_REQUEST['cat_tax']) && isset($_REQUEST['exclude'])) {
	116	+ geodir_addpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['main_catid'], '', '', '', $_REQUEST['exclude']);
	117	+ } else if (isset($_REQUEST['catpid']) && isset($_REQUEST['cat_tax'])) {
	118	+ geodir_editpost_categories_html($_REQUEST['cat_tax'], $_REQUEST['catpid']);
	119	+ }
119	120	}
120	121
121	122	if ((isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] == 'admin_ajax') \|\| isset($_REQUEST['create_field']) \|\| isset($_REQUEST['sort_create_field'])) {
		@@ -137,12 +138,13 @@ discard block
		block discarded – undo
137	138	if (current_user_can('manage_options')) {
138	139	switch ($_REQUEST['geodir_autofill']):
139	140	case "geodir_dummy_delete" :
140		- if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
141		- return;
	141	+ if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
	142	+ return;
	143	+ }
142	144
143	145	$datatype = isset($_REQUEST['datatype']) ? sanitize_key($_REQUEST['datatype']) : '';
144		- if (isset($_REQUEST['posttype']))
145		- /**
	146	+ if (isset($_REQUEST['posttype'])) {
	147	+ /**
146	148	* Used to delete the dummy post data per post type.
147	149	*
148	150	* Uses dynamic hook, geodir_delete_dummy_posts_$_REQUEST['posttype'].
		@@ -151,11 +153,13 @@ discard block
		block discarded – undo
151	153	* @param string $posttype The post type to insert.
152	154	* @param string $datatype The type of dummy data to insert.
153	155	*/
154		- do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
	156	+ do_action('geodir_delete_dummy_posts' ,sanitize_key($_REQUEST['posttype']),$datatype);
	157	+ }
155	158	break;
156	159	case "geodir_dummy_insert" :
157		- if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename'))
158		- return;
	160	+ if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir_dummy_posts_insert_noncename')) {
	161	+ return;
	162	+ }
159	163
160	164	global $city_bound_lat1, $city_bound_lng1, $city_bound_lat2, $city_bound_lng2;
161	165	$city_bound_lat1 = $_REQUEST['city_bound_lat1'];
		@@ -254,8 +258,9 @@ discard block
		block discarded – undo
254	258	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
255	259	$redirect_to = get_permalink(geodir_add_listing_page_id());
256	260	$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
257		- } else
258		- $redirect_to = get_permalink(geodir_add_listing_page_id());
	261	+ } else {
	262	+ $redirect_to = get_permalink(geodir_add_listing_page_id());
	263	+ }
259	264
260	265	wp_redirect($redirect_to);
261	266	} else {
		@@ -268,9 +273,9 @@ discard block
		block discarded – undo
268	273
269	274	$gd_session->un_set('listing');
270	275
271		- if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid']))
272		- wp_redirect(get_permalink($_REQUEST['pid']));
273		- else {
	276	+ if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && get_permalink($_REQUEST['pid'])) {
	277	+ wp_redirect(get_permalink($_REQUEST['pid']));
	278	+ } else {
274	279	geodir_remove_temp_images();
275	280	wp_redirect(geodir_getlink(get_permalink(geodir_add_listing_page_id()), array('listing_type' => $_REQUEST['listing_type'])));
276	281	}
		@@ -298,8 +303,9 @@ discard block
		block discarded – undo
298	303	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
299	304	$redirect_to = get_permalink(geodir_add_listing_page_id());
300	305	$redirect_to = geodir_getlink($redirect_to, array('pid' => $post->pid), false);
301		- } else
302		- $redirect_to = get_permalink(geodir_add_listing_page_id());
	306	+ } else {
	307	+ $redirect_to = get_permalink(geodir_add_listing_page_id());
	308	+ }
303	309
304	310	$gd_session->un_set('listing');
305	311	wp_redirect($redirect_to);
		@@ -320,8 +326,9 @@ discard block
		block discarded – undo
320	326	$lastid = wp_delete_post($_REQUEST['pid']);
321	327	}
322	328
323		- if ($lastid && !is_wp_error($lastid))
324		- wp_redirect($_SERVER['HTTP_REFERER']);
	329	+ if ($lastid && !is_wp_error($lastid)) {
	330	+ wp_redirect($_SERVER['HTTP_REFERER']);
	331	+ }
325	332
326	333	//wp_redirect( geodir_getlink(get_author_posts_url($current_user->ID),array('geodir_dashbord'=>'true','stype'=>$post_type ),false) );
327	334	}

		@@ -500,7 +500,7 @@ discard block
		block discarded – undo
500	500	* @param [$issuer] the expected issues, defaults to Google
501	501	* @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
502	502	* @throws Google_Auth_Exception
503		- * @return mixed token information if valid, false if not
	503	+ * @return Google_Auth_LoginTicket token information if valid, false if not
504	504	*/
505	505	public function verifySignedJwtWithCerts(
506	506	$jwt,
		@@ -626,6 +626,7 @@ discard block
		block discarded – undo
626	626
627	627	/**
628	628	* Add a parameter to the auth params if not empty string.
	629	+ * @param string $name
629	630	*/
630	631	private function maybeAddParam($params, $name)
631	632	{

		@@ -16,7 +16,7 @@ discard block
		block discarded – undo
16	16	*/
17	17
18	18	if (!class_exists('Google_Client')) {
19		- require_once dirname(__FILE__) . '/../autoload.php';
	19	+ require_once dirname(__FILE__).'/../autoload.php';
20	20	}
21	21
22	22	/**
		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	if ($decodedResponse != null && $decodedResponse['error']) {
120	120	$errorText = $decodedResponse['error'];
121	121	if (isset($decodedResponse['error_description'])) {
122		- $errorText .= ": " . $decodedResponse['error_description'];
	122	+ $errorText .= ": ".$decodedResponse['error_description'];
123	123	}
124	124	}
125	125	throw new Google_Auth_Exception(
		@@ -171,7 +171,7 @@ discard block
		block discarded – undo
171	171	$params['state'] = $this->state;
172	172	}
173	173
174		- return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
	174	+ return self::OAUTH2_AUTH_URL."?".http_build_query($params, '', '&');
175	175	}
176	176
177	177	/**
		@@ -184,7 +184,7 @@ discard block
		block discarded – undo
184	184	if ($token == null) {
185	185	throw new Google_Auth_Exception('Could not json decode the token');
186	186	}
187		- if (! isset($token['access_token'])) {
	187	+ if (!isset($token['access_token'])) {
188	188	throw new Google_Auth_Exception("Invalid token format");
189	189	}
190	190	$this->token = $token;
		@@ -239,7 +239,7 @@ discard block
		block discarded – undo
239	239	$this->refreshTokenWithAssertion();
240	240	} else {
241	241	$this->client->getLogger()->debug('OAuth2 access token expired');
242		- if (! array_key_exists('refresh_token', $this->token)) {
	242	+ if (!array_key_exists('refresh_token', $this->token)) {
243	243	$error = "The OAuth 2.0 access token has expired,"
244	244	." and a refresh token is not available. Refresh tokens"
245	245	." are not returned for responses that were auto-approved.";
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255
256	256	// Add the OAuth2 header to the request
257	257	$request->setRequestHeaders(
258		- array('Authorization' => 'Bearer ' . $this->token['access_token'])
	258	+ array('Authorization' => 'Bearer '.$this->token['access_token'])
259	259	);
260	260
261	261	return $request;
		@@ -349,7 +349,7 @@ discard block
		block discarded – undo
349	349	throw new Google_Auth_Exception("Could not json decode the access token");
350	350	}
351	351
352		- if (! isset($token['access_token']) \|\| ! isset($token['expires_in'])) {
	352	+ if (!isset($token['access_token']) \|\| !isset($token['expires_in'])) {
353	353	throw new Google_Auth_Exception("Invalid token format");
354	354	}
355	355
		@@ -443,8 +443,8 @@ discard block
		block discarded – undo
443	443	return json_decode($file, true);
444	444	} else {
445	445	throw new Google_Auth_Exception(
446		- "Failed to retrieve verification certificates: '" .
447		- $url . "'."
	446	+ "Failed to retrieve verification certificates: '".
	447	+ $url."'."
448	448	);
449	449	}
450	450	}
		@@ -462,8 +462,8 @@ discard block
		block discarded – undo
462	462	}
463	463	}
464	464	throw new Google_Auth_Exception(
465		- "Failed to retrieve verification certificates: '" .
466		- $request->getResponseBody() . "'.",
	465	+ "Failed to retrieve verification certificates: '".
	466	+ $request->getResponseBody()."'.",
467	467	$request->getResponseHttpCode()
468	468	);
469	469	}
		@@ -518,20 +518,20 @@ discard block
		block discarded – undo
518	518	if (count($segments) != 3) {
519	519	throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
520	520	}
521		- $signed = $segments[0] . "." . $segments[1];
	521	+ $signed = $segments[0].".".$segments[1];
522	522	$signature = Google_Utils::urlSafeB64Decode($segments[2]);
523	523
524	524	// Parse envelope.
525	525	$envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
526	526	if (!$envelope) {
527		- throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
	527	+ throw new Google_Auth_Exception("Can't parse token envelope: ".$segments[0]);
528	528	}
529	529
530	530	// Parse token
531	531	$json_body = Google_Utils::urlSafeB64Decode($segments[1]);
532	532	$payload = json_decode($json_body, true);
533	533	if (!$payload) {
534		- throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
	534	+ throw new Google_Auth_Exception("Can't parse token payload: ".$segments[1]);
535	535	}
536	536
537	537	// Check signature

		@@ -129,6 +129,9 @@ discard block
		block discarded – undo
129	129	);
130	130	}
131	131
	132	+ /**
	133	+ * @param string $file
	134	+ */
132	135	private function getWriteableCacheFile($file)
133	136	{
134	137	return $this->getCacheFile($file, true);
		@@ -139,6 +142,9 @@ discard block
		block discarded – undo
139	142	return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
140	143	}
141	144
	145	+ /**
	146	+ * @param boolean $forWrite
	147	+ */
142	148	private function getCacheDir($file, $forWrite)
143	149	{
144	150	// use the first 2 characters of the hash as a directory prefix
		@@ -157,11 +163,17 @@ discard block
		block discarded – undo
157	163	return $storageDir;
158	164	}
159	165
	166	+ /**
	167	+ * @param string $storageFile
	168	+ */
160	169	private function acquireReadLock($storageFile)
161	170	{
162	171	return $this->acquireLock(LOCK_SH, $storageFile);
163	172	}
164	173
	174	+ /**
	175	+ * @param string $storageFile
	176	+ */
165	177	private function acquireWriteLock($storageFile)
166	178	{
167	179	$rc = $this->acquireLock(LOCK_EX, $storageFile);
		@@ -175,6 +187,9 @@ discard block
		block discarded – undo
175	187	return $rc;
176	188	}
177	189
	190	+ /**
	191	+ * @param integer $type
	192	+ */
178	193	private function acquireLock($type, $storageFile)
179	194	{
180	195	$mode = $type == LOCK_EX ? "w" : "r";
		@@ -197,6 +212,9 @@ discard block
		block discarded – undo
197	212	return true;
198	213	}
199	214
	215	+ /**
	216	+ * @param string $storageFile
	217	+ */
200	218	public function unlock($storageFile)
201	219	{
202	220	if ($this->fh) {

		@@ -40,167 +40,167 @@
		block discarded – undo
40	40
41	41	public function __construct(Google_Client $client)
42	42	{
43		- $this->client = $client;
44		- $this->path = $this->client->getClassConfig($this, 'directory');
	43	+ $this->client = $client;
	44	+ $this->path = $this->client->getClassConfig($this, 'directory');
45	45	}
46	46
47	47	public function get($key, $expiration = false)
48	48	{
49		- $storageFile = $this->getCacheFile($key);
50		- $data = false;
51		-
52		- if (!file_exists($storageFile)) {
53		- $this->client->getLogger()->debug(
54		- 'File cache miss',
55		- array('key' => $key, 'file' => $storageFile)
56		- );
57		- return false;
58		- }
59		-
60		- if ($expiration) {
61		- $mtime = filemtime($storageFile);
62		- if ((time() - $mtime) >= $expiration) {
63		- $this->client->getLogger()->debug(
64		- 'File cache miss (expired)',
65		- array('key' => $key, 'file' => $storageFile)
66		- );
67		- $this->delete($key);
68		- return false;
69		- }
70		- }
71		-
72		- if ($this->acquireReadLock($storageFile)) {
73		- if (filesize($storageFile) > 0) {
74		- $data = fread($this->fh, filesize($storageFile));
75		- $data = unserialize($data);
76		- } else {
77		- $this->client->getLogger()->debug(
78		- 'Cache file was empty',
79		- array('file' => $storageFile)
80		- );
81		- }
82		- $this->unlock($storageFile);
83		- }
84		-
85		- $this->client->getLogger()->debug(
86		- 'File cache hit',
87		- array('key' => $key, 'file' => $storageFile, 'var' => $data)
88		- );
89		-
90		- return $data;
	49	+ $storageFile = $this->getCacheFile($key);
	50	+ $data = false;
	51	+
	52	+ if (!file_exists($storageFile)) {
	53	+ $this->client->getLogger()->debug(
	54	+ 'File cache miss',
	55	+ array('key' => $key, 'file' => $storageFile)
	56	+ );
	57	+ return false;
	58	+ }
	59	+
	60	+ if ($expiration) {
	61	+ $mtime = filemtime($storageFile);
	62	+ if ((time() - $mtime) >= $expiration) {
	63	+ $this->client->getLogger()->debug(
	64	+ 'File cache miss (expired)',
	65	+ array('key' => $key, 'file' => $storageFile)
	66	+ );
	67	+ $this->delete($key);
	68	+ return false;
	69	+ }
	70	+ }
	71	+
	72	+ if ($this->acquireReadLock($storageFile)) {
	73	+ if (filesize($storageFile) > 0) {
	74	+ $data = fread($this->fh, filesize($storageFile));
	75	+ $data = unserialize($data);
	76	+ } else {
	77	+ $this->client->getLogger()->debug(
	78	+ 'Cache file was empty',
	79	+ array('file' => $storageFile)
	80	+ );
	81	+ }
	82	+ $this->unlock($storageFile);
	83	+ }
	84	+
	85	+ $this->client->getLogger()->debug(
	86	+ 'File cache hit',
	87	+ array('key' => $key, 'file' => $storageFile, 'var' => $data)
	88	+ );
	89	+
	90	+ return $data;
91	91	}
92	92
93	93	public function set($key, $value)
94	94	{
95		- $storageFile = $this->getWriteableCacheFile($key);
96		- if ($this->acquireWriteLock($storageFile)) {
97		- // We serialize the whole request object, since we don't only want the
98		- // responseContent but also the postBody used, headers, size, etc.
99		- $data = serialize($value);
100		- $result = fwrite($this->fh, $data);
101		- $this->unlock($storageFile);
102		-
103		- $this->client->getLogger()->debug(
104		- 'File cache set',
105		- array('key' => $key, 'file' => $storageFile, 'var' => $value)
106		- );
107		- } else {
108		- $this->client->getLogger()->notice(
109		- 'File cache set failed',
110		- array('key' => $key, 'file' => $storageFile)
111		- );
112		- }
	95	+ $storageFile = $this->getWriteableCacheFile($key);
	96	+ if ($this->acquireWriteLock($storageFile)) {
	97	+ // We serialize the whole request object, since we don't only want the
	98	+ // responseContent but also the postBody used, headers, size, etc.
	99	+ $data = serialize($value);
	100	+ $result = fwrite($this->fh, $data);
	101	+ $this->unlock($storageFile);
	102	+
	103	+ $this->client->getLogger()->debug(
	104	+ 'File cache set',
	105	+ array('key' => $key, 'file' => $storageFile, 'var' => $value)
	106	+ );
	107	+ } else {
	108	+ $this->client->getLogger()->notice(
	109	+ 'File cache set failed',
	110	+ array('key' => $key, 'file' => $storageFile)
	111	+ );
	112	+ }
113	113	}
114	114
115	115	public function delete($key)
116	116	{
117		- $file = $this->getCacheFile($key);
118		- if (file_exists($file) && !unlink($file)) {
119		- $this->client->getLogger()->error(
120		- 'File cache delete failed',
121		- array('key' => $key, 'file' => $file)
122		- );
123		- throw new Google_Cache_Exception("Cache file could not be deleted");
124		- }
125		-
126		- $this->client->getLogger()->debug(
127		- 'File cache delete',
128		- array('key' => $key, 'file' => $file)
129		- );
	117	+ $file = $this->getCacheFile($key);
	118	+ if (file_exists($file) && !unlink($file)) {
	119	+ $this->client->getLogger()->error(
	120	+ 'File cache delete failed',
	121	+ array('key' => $key, 'file' => $file)
	122	+ );
	123	+ throw new Google_Cache_Exception("Cache file could not be deleted");
	124	+ }
	125	+
	126	+ $this->client->getLogger()->debug(
	127	+ 'File cache delete',
	128	+ array('key' => $key, 'file' => $file)
	129	+ );
130	130	}
131	131
132	132	private function getWriteableCacheFile($file)
133	133	{
134		- return $this->getCacheFile($file, true);
	134	+ return $this->getCacheFile($file, true);
135	135	}
136	136
137	137	private function getCacheFile($file, $forWrite = false)
138	138	{
139		- return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
	139	+ return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
140	140	}
141	141
142	142	private function getCacheDir($file, $forWrite)
143	143	{
144		- // use the first 2 characters of the hash as a directory prefix
145		- // this should prevent slowdowns due to huge directory listings
146		- // and thus give some basic amount of scalability
147		- $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
148		- if ($forWrite && ! is_dir($storageDir)) {
149		- if (! mkdir($storageDir, 0755, true)) {
150		- $this->client->getLogger()->error(
151		- 'File cache creation failed',
152		- array('dir' => $storageDir)
153		- );
154		- throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
155		- }
156		- }
157		- return $storageDir;
	144	+ // use the first 2 characters of the hash as a directory prefix
	145	+ // this should prevent slowdowns due to huge directory listings
	146	+ // and thus give some basic amount of scalability
	147	+ $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
	148	+ if ($forWrite && ! is_dir($storageDir)) {
	149	+ if (! mkdir($storageDir, 0755, true)) {
	150	+ $this->client->getLogger()->error(
	151	+ 'File cache creation failed',
	152	+ array('dir' => $storageDir)
	153	+ );
	154	+ throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
	155	+ }
	156	+ }
	157	+ return $storageDir;
158	158	}
159	159
160	160	private function acquireReadLock($storageFile)
161	161	{
162		- return $this->acquireLock(LOCK_SH, $storageFile);
	162	+ return $this->acquireLock(LOCK_SH, $storageFile);
163	163	}
164	164
165	165	private function acquireWriteLock($storageFile)
166	166	{
167		- $rc = $this->acquireLock(LOCK_EX, $storageFile);
168		- if (!$rc) {
169		- $this->client->getLogger()->notice(
170		- 'File cache write lock failed',
171		- array('file' => $storageFile)
172		- );
173		- $this->delete($storageFile);
174		- }
175		- return $rc;
	167	+ $rc = $this->acquireLock(LOCK_EX, $storageFile);
	168	+ if (!$rc) {
	169	+ $this->client->getLogger()->notice(
	170	+ 'File cache write lock failed',
	171	+ array('file' => $storageFile)
	172	+ );
	173	+ $this->delete($storageFile);
	174	+ }
	175	+ return $rc;
176	176	}
177	177
178	178	private function acquireLock($type, $storageFile)
179	179	{
180		- $mode = $type == LOCK_EX ? "w" : "r";
181		- $this->fh = fopen($storageFile, $mode);
182		- if (!$this->fh) {
183		- $this->client->getLogger()->error(
184		- 'Failed to open file during lock acquisition',
185		- array('file' => $storageFile)
186		- );
187		- return false;
188		- }
189		- $count = 0;
190		- while (!flock($this->fh, $type \| LOCK_NB)) {
191		- // Sleep for 10ms.
192		- usleep(10000);
193		- if (++$count < self::MAX_LOCK_RETRIES) {
194		- return false;
195		- }
196		- }
197		- return true;
	180	+ $mode = $type == LOCK_EX ? "w" : "r";
	181	+ $this->fh = fopen($storageFile, $mode);
	182	+ if (!$this->fh) {
	183	+ $this->client->getLogger()->error(
	184	+ 'Failed to open file during lock acquisition',
	185	+ array('file' => $storageFile)
	186	+ );
	187	+ return false;
	188	+ }
	189	+ $count = 0;
	190	+ while (!flock($this->fh, $type \| LOCK_NB)) {
	191	+ // Sleep for 10ms.
	192	+ usleep(10000);
	193	+ if (++$count < self::MAX_LOCK_RETRIES) {
	194	+ return false;
	195	+ }
	196	+ }
	197	+ return true;
198	198	}
199	199
200	200	public function unlock($storageFile)
201	201	{
202		- if ($this->fh) {
203		- flock($this->fh, LOCK_UN);
204		- }
	202	+ if ($this->fh) {
	203	+ flock($this->fh, LOCK_UN);
	204	+ }
205	205	}
206	206	}

		@@ -74,32 +74,32 @@ discard block
		block discarded – undo
74	74	*/
75	75	public function __construct($config = null)
76	76	{
77		- if (is_string($config) && strlen($config)) {
78		- $config = new Google_Config($config);
79		- } else if ( !($config instanceof Google_Config)) {
80		- $config = new Google_Config();
	77	+ if (is_string($config) && strlen($config)) {
	78	+ $config = new Google_Config($config);
	79	+ } else if ( !($config instanceof Google_Config)) {
	80	+ $config = new Google_Config();
81	81
82		- if ($this->isAppEngine()) {
83		- // Automatically use Memcache if we're in AppEngine.
84		- $config->setCacheClass('Google_Cache_Memcache');
85		- }
	82	+ if ($this->isAppEngine()) {
	83	+ // Automatically use Memcache if we're in AppEngine.
	84	+ $config->setCacheClass('Google_Cache_Memcache');
	85	+ }
86	86
87		- if (version_compare(phpversion(), "5.3.4", "<=") \|\| $this->isAppEngine()) {
88		- // Automatically disable compress.zlib, as currently unsupported.
89		- $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
90		- }
91		- }
	87	+ if (version_compare(phpversion(), "5.3.4", "<=") \|\| $this->isAppEngine()) {
	88	+ // Automatically disable compress.zlib, as currently unsupported.
	89	+ $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
	90	+ }
	91	+ }
92	92
93		- if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
94		- if (function_exists('curl_version') && function_exists('curl_exec')
95		- && !$this->isAppEngine()) {
96		- $config->setIoClass("Google_IO_Curl");
97		- } else {
98		- $config->setIoClass("Google_IO_Stream");
99		- }
100		- }
	93	+ if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
	94	+ if (function_exists('curl_version') && function_exists('curl_exec')
	95	+ && !$this->isAppEngine()) {
	96	+ $config->setIoClass("Google_IO_Curl");
	97	+ } else {
	98	+ $config->setIoClass("Google_IO_Stream");
	99	+ }
	100	+ }
101	101
102		- $this->config = $config;
	102	+ $this->config = $config;
103	103	}
104	104
105	105	/**
		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	*/
110	110	public function getLibraryVersion()
111	111	{
112		- return self::LIBVER;
	112	+ return self::LIBVER;
113	113	}
114	114
115	115	/**
		@@ -124,8 +124,8 @@ discard block
		block discarded – undo
124	124	*/
125	125	public function authenticate($code, $crossClient = false)
126	126	{
127		- $this->authenticated = true;
128		- return $this->getAuth()->authenticate($code, $crossClient);
	127	+ $this->authenticated = true;
	128	+ return $this->getAuth()->authenticate($code, $crossClient);
129	129	}
130	130
131	131	/**
		@@ -141,18 +141,18 @@ discard block
		block discarded – undo
141	141	*/
142	142	public function loadServiceAccountJson($jsonLocation, $scopes)
143	143	{
144		- $data = json_decode(file_get_contents($jsonLocation));
145		- if (isset($data->type) && $data->type == 'service_account') {
146		- // Service Account format.
147		- $cred = new Google_Auth_AssertionCredentials(
148		- $data->client_email,
149		- $scopes,
150		- $data->private_key
151		- );
152		- return $cred;
153		- } else {
154		- throw new Google_Exception("Invalid service account JSON file.");
155		- }
	144	+ $data = json_decode(file_get_contents($jsonLocation));
	145	+ if (isset($data->type) && $data->type == 'service_account') {
	146	+ // Service Account format.
	147	+ $cred = new Google_Auth_AssertionCredentials(
	148	+ $data->client_email,
	149	+ $scopes,
	150	+ $data->private_key
	151	+ );
	152	+ return $cred;
	153	+ } else {
	154	+ throw new Google_Exception("Invalid service account JSON file.");
	155	+ }
156	156	}
157	157
158	158	/**
		@@ -165,16 +165,16 @@ discard block
		block discarded – undo
165	165	*/
166	166	public function setAuthConfig($json)
167	167	{
168		- $data = json_decode($json);
169		- $key = isset($data->installed) ? 'installed' : 'web';
170		- if (!isset($data->$key)) {
171		- throw new Google_Exception("Invalid client secret JSON file.");
172		- }
173		- $this->setClientId($data->$key->client_id);
174		- $this->setClientSecret($data->$key->client_secret);
175		- if (isset($data->$key->redirect_uris)) {
176		- $this->setRedirectUri($data->$key->redirect_uris[0]);
177		- }
	168	+ $data = json_decode($json);
	169	+ $key = isset($data->installed) ? 'installed' : 'web';
	170	+ if (!isset($data->$key)) {
	171	+ throw new Google_Exception("Invalid client secret JSON file.");
	172	+ }
	173	+ $this->setClientId($data->$key->client_id);
	174	+ $this->setClientSecret($data->$key->client_secret);
	175	+ if (isset($data->$key->redirect_uris)) {
	176	+ $this->setRedirectUri($data->$key->redirect_uris[0]);
	177	+ }
178	178	}
179	179
180	180	/**
		@@ -186,7 +186,7 @@ discard block
		block discarded – undo
186	186	*/
187	187	public function setAuthConfigFile($file)
188	188	{
189		- $this->setAuthConfig(file_get_contents($file));
	189	+ $this->setAuthConfig(file_get_contents($file));
190	190	}
191	191
192	192	/**
		@@ -196,11 +196,11 @@ discard block
		block discarded – undo
196	196	*/
197	197	public function prepareScopes()
198	198	{
199		- if (empty($this->requestedScopes)) {
200		- throw new Google_Auth_Exception("No scopes specified");
201		- }
202		- $scopes = implode(' ', $this->requestedScopes);
203		- return $scopes;
	199	+ if (empty($this->requestedScopes)) {
	200	+ throw new Google_Auth_Exception("No scopes specified");
	201	+ }
	202	+ $scopes = implode(' ', $this->requestedScopes);
	203	+ return $scopes;
204	204	}
205	205
206	206	/**
		@@ -212,10 +212,10 @@ discard block
		block discarded – undo
212	212	*/
213	213	public function setAccessToken($accessToken)
214	214	{
215		- if ($accessToken == 'null') {
216		- $accessToken = null;
217		- }
218		- $this->getAuth()->setAccessToken($accessToken);
	215	+ if ($accessToken == 'null') {
	216	+ $accessToken = null;
	217	+ }
	218	+ $this->getAuth()->setAccessToken($accessToken);
219	219	}
220	220
221	221
		@@ -226,8 +226,8 @@ discard block
		block discarded – undo
226	226	*/
227	227	public function setAuth(Google_Auth_Abstract $auth)
228	228	{
229		- $this->config->setAuthClass(get_class($auth));
230		- $this->auth = $auth;
	229	+ $this->config->setAuthClass(get_class($auth));
	230	+ $this->auth = $auth;
231	231	}
232	232
233	233	/**
		@@ -236,8 +236,8 @@ discard block
		block discarded – undo
236	236	*/
237	237	public function setIo(Google_IO_Abstract $io)
238	238	{
239		- $this->config->setIoClass(get_class($io));
240		- $this->io = $io;
	239	+ $this->config->setIoClass(get_class($io));
	240	+ $this->io = $io;
241	241	}
242	242
243	243	/**
		@@ -246,8 +246,8 @@ discard block
		block discarded – undo
246	246	*/
247	247	public function setCache(Google_Cache_Abstract $cache)
248	248	{
249		- $this->config->setCacheClass(get_class($cache));
250		- $this->cache = $cache;
	249	+ $this->config->setCacheClass(get_class($cache));
	250	+ $this->cache = $cache;
251	251	}
252	252
253	253	/**
		@@ -256,8 +256,8 @@ discard block
		block discarded – undo
256	256	*/
257	257	public function setLogger(Google_Logger_Abstract $logger)
258	258	{
259		- $this->config->setLoggerClass(get_class($logger));
260		- $this->logger = $logger;
	259	+ $this->config->setLoggerClass(get_class($logger));
	260	+ $this->logger = $logger;
261	261	}
262	262
263	263	/**
		@@ -266,8 +266,8 @@ discard block
		block discarded – undo
266	266	*/
267	267	public function createAuthUrl()
268	268	{
269		- $scopes = $this->prepareScopes();
270		- return $this->getAuth()->createAuthUrl($scopes);
	269	+ $scopes = $this->prepareScopes();
	270	+ return $this->getAuth()->createAuthUrl($scopes);
271	271	}
272	272
273	273	/**
		@@ -278,11 +278,11 @@ discard block
		block discarded – undo
278	278	*/
279	279	public function getAccessToken()
280	280	{
281		- $token = $this->getAuth()->getAccessToken();
282		- // The response is json encoded, so could be the string null.
283		- // It is arguable whether this check should be here or lower
284		- // in the library.
285		- return (null == $token \|\| 'null' == $token \|\| '[]' == $token) ? null : $token;
	281	+ $token = $this->getAuth()->getAccessToken();
	282	+ // The response is json encoded, so could be the string null.
	283	+ // It is arguable whether this check should be here or lower
	284	+ // in the library.
	285	+ return (null == $token \|\| 'null' == $token \|\| '[]' == $token) ? null : $token;
286	286	}
287	287
288	288	/**
		@@ -291,7 +291,7 @@ discard block
		block discarded – undo
291	291	*/
292	292	public function getRefreshToken()
293	293	{
294		- return $this->getAuth()->getRefreshToken();
	294	+ return $this->getAuth()->getRefreshToken();
295	295	}
296	296
297	297	/**
		@@ -300,7 +300,7 @@ discard block
		block discarded – undo
300	300	*/
301	301	public function isAccessTokenExpired()
302	302	{
303		- return $this->getAuth()->isAccessTokenExpired();
	303	+ return $this->getAuth()->isAccessTokenExpired();
304	304	}
305	305
306	306	/**
		@@ -310,7 +310,7 @@ discard block
		block discarded – undo
310	310	*/
311	311	public function setState($state)
312	312	{
313		- $this->getAuth()->setState($state);
	313	+ $this->getAuth()->setState($state);
314	314	}
315	315
316	316	/**
		@@ -320,7 +320,7 @@ discard block
		block discarded – undo
320	320	*/
321	321	public function setAccessType($accessType)
322	322	{
323		- $this->config->setAccessType($accessType);
	323	+ $this->config->setAccessType($accessType);
324	324	}
325	325
326	326	/**
		@@ -330,7 +330,7 @@ discard block
		block discarded – undo
330	330	*/
331	331	public function setApprovalPrompt($approvalPrompt)
332	332	{
333		- $this->config->setApprovalPrompt($approvalPrompt);
	333	+ $this->config->setApprovalPrompt($approvalPrompt);
334	334	}
335	335
336	336	/**
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	*/
340	340	public function setLoginHint($loginHint)
341	341	{
342		- $this->config->setLoginHint($loginHint);
	342	+ $this->config->setLoginHint($loginHint);
343	343	}
344	344
345	345	/**
		@@ -348,7 +348,7 @@ discard block
		block discarded – undo
348	348	*/
349	349	public function setApplicationName($applicationName)
350	350	{
351		- $this->config->setApplicationName($applicationName);
	351	+ $this->config->setApplicationName($applicationName);
352	352	}
353	353
354	354	/**
		@@ -357,7 +357,7 @@ discard block
		block discarded – undo
357	357	*/
358	358	public function setClientId($clientId)
359	359	{
360		- $this->config->setClientId($clientId);
	360	+ $this->config->setClientId($clientId);
361	361	}
362	362
363	363	/**
		@@ -366,7 +366,7 @@ discard block
		block discarded – undo
366	366	*/
367	367	public function setClientSecret($clientSecret)
368	368	{
369		- $this->config->setClientSecret($clientSecret);
	369	+ $this->config->setClientSecret($clientSecret);
370	370	}
371	371
372	372	/**
		@@ -375,7 +375,7 @@ discard block
		block discarded – undo
375	375	*/
376	376	public function setRedirectUri($redirectUri)
377	377	{
378		- $this->config->setRedirectUri($redirectUri);
	378	+ $this->config->setRedirectUri($redirectUri);
379	379	}
380	380
381	381	/**
		@@ -388,10 +388,10 @@ discard block
		block discarded – undo
388	388	*/
389	389	public function setRequestVisibleActions($requestVisibleActions)
390	390	{
391		- if (is_array($requestVisibleActions)) {
392		- $requestVisibleActions = join(" ", $requestVisibleActions);
393		- }
394		- $this->config->setRequestVisibleActions($requestVisibleActions);
	391	+ if (is_array($requestVisibleActions)) {
	392	+ $requestVisibleActions = join(" ", $requestVisibleActions);
	393	+ }
	394	+ $this->config->setRequestVisibleActions($requestVisibleActions);
395	395	}
396	396
397	397	/**
		@@ -401,7 +401,7 @@ discard block
		block discarded – undo
401	401	*/
402	402	public function setDeveloperKey($developerKey)
403	403	{
404		- $this->config->setDeveloperKey($developerKey);
	404	+ $this->config->setDeveloperKey($developerKey);
405	405	}
406	406
407	407	/**
		@@ -412,7 +412,7 @@ discard block
		block discarded – undo
412	412	*/
413	413	public function setHostedDomain($hd)
414	414	{
415		- $this->config->setHostedDomain($hd);
	415	+ $this->config->setHostedDomain($hd);
416	416	}
417	417
418	418	/**
		@@ -423,7 +423,7 @@ discard block
		block discarded – undo
423	423	*/
424	424	public function setPrompt($prompt)
425	425	{
426		- $this->config->setPrompt($prompt);
	426	+ $this->config->setPrompt($prompt);
427	427	}
428	428
429	429	/**
		@@ -434,7 +434,7 @@ discard block
		block discarded – undo
434	434	*/
435	435	public function setOpenidRealm($realm)
436	436	{
437		- $this->config->setOpenidRealm($realm);
	437	+ $this->config->setOpenidRealm($realm);
438	438	}
439	439
440	440	/**
		@@ -445,7 +445,7 @@ discard block
		block discarded – undo
445	445	*/
446	446	public function setIncludeGrantedScopes($include)
447	447	{
448		- $this->config->setIncludeGrantedScopes($include);
	448	+ $this->config->setIncludeGrantedScopes($include);
449	449	}
450	450
451	451	/**
		@@ -454,7 +454,7 @@ discard block
		block discarded – undo
454	454	*/
455	455	public function refreshToken($refreshToken)
456	456	{
457		- $this->getAuth()->refreshToken($refreshToken);
	457	+ $this->getAuth()->refreshToken($refreshToken);
458	458	}
459	459
460	460	/**
		@@ -466,7 +466,7 @@ discard block
		block discarded – undo
466	466	*/
467	467	public function revokeToken($token = null)
468	468	{
469		- return $this->getAuth()->revokeToken($token);
	469	+ return $this->getAuth()->revokeToken($token);
470	470	}
471	471
472	472	/**
		@@ -479,7 +479,7 @@ discard block
		block discarded – undo
479	479	*/
480	480	public function verifyIdToken($token = null)
481	481	{
482		- return $this->getAuth()->verifyIdToken($token);
	482	+ return $this->getAuth()->verifyIdToken($token);
483	483	}
484	484
485	485	/**
		@@ -494,9 +494,9 @@ discard block
		block discarded – undo
494	494	*/
495	495	public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
496	496	{
497		- $auth = new Google_Auth_OAuth2($this);
498		- $certs = $auth->retrieveCertsFromLocation($cert_location);
499		- return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
	497	+ $auth = new Google_Auth_OAuth2($this);
	498	+ $certs = $auth->retrieveCertsFromLocation($cert_location);
	499	+ return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
500	500	}
501	501
502	502	/**
		@@ -504,7 +504,7 @@ discard block
		block discarded – undo
504	504	*/
505	505	public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
506	506	{
507		- $this->getAuth()->setAssertionCredentials($creds);
	507	+ $this->getAuth()->setAssertionCredentials($creds);
508	508	}
509	509
510	510	/**
		@@ -515,8 +515,8 @@ discard block
		block discarded – undo
515	515	*/
516	516	public function setScopes($scopes)
517	517	{
518		- $this->requestedScopes = array();
519		- $this->addScope($scopes);
	518	+ $this->requestedScopes = array();
	519	+ $this->addScope($scopes);
520	520	}
521	521
522	522	/**
		@@ -528,13 +528,13 @@ discard block
		block discarded – undo
528	528	*/
529	529	public function addScope($scope_or_scopes)
530	530	{
531		- if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
532		- $this->requestedScopes[] = $scope_or_scopes;
533		- } else if (is_array($scope_or_scopes)) {
534		- foreach ($scope_or_scopes as $scope) {
535		- $this->addScope($scope);
536		- }
537		- }
	531	+ if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
	532	+ $this->requestedScopes[] = $scope_or_scopes;
	533	+ } else if (is_array($scope_or_scopes)) {
	534	+ foreach ($scope_or_scopes as $scope) {
	535	+ $this->addScope($scope);
	536	+ }
	537	+ }
538	538	}
539	539
540	540	/**
		@@ -544,7 +544,7 @@ discard block
		block discarded – undo
544	544	*/
545	545	public function getScopes()
546	546	{
547		- return $this->requestedScopes;
	547	+ return $this->requestedScopes;
548	548	}
549	549
550	550	/**
		@@ -556,8 +556,8 @@ discard block
		block discarded – undo
556	556	*/
557	557	public function setUseBatch($useBatch)
558	558	{
559		- // This is actually an alias for setDefer.
560		- $this->setDefer($useBatch);
	559	+ // This is actually an alias for setDefer.
	560	+ $this->setDefer($useBatch);
561	561	}
562	562
563	563	/**
		@@ -568,7 +568,7 @@ discard block
		block discarded – undo
568	568	*/
569	569	public function setDefer($defer)
570	570	{
571		- $this->deferExecution = $defer;
	571	+ $this->deferExecution = $defer;
572	572	}
573	573
574	574	/**
		@@ -580,22 +580,22 @@ discard block
		block discarded – undo
580	580	*/
581	581	public function execute($request)
582	582	{
583		- if ($request instanceof Google_Http_Request) {
584		- $request->setUserAgent(
585		- $this->getApplicationName()
586		- . " " . self::USER_AGENT_SUFFIX
587		- . $this->getLibraryVersion()
588		- );
589		- if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
590		- $request->enableGzip();
591		- }
592		- $request->maybeMoveParametersToBody();
593		- return Google_Http_REST::execute($this, $request);
594		- } else if ($request instanceof Google_Http_Batch) {
595		- return $request->execute();
596		- } else {
597		- throw new Google_Exception("Do not know how to execute this type of object.");
598		- }
	583	+ if ($request instanceof Google_Http_Request) {
	584	+ $request->setUserAgent(
	585	+ $this->getApplicationName()
	586	+ . " " . self::USER_AGENT_SUFFIX
	587	+ . $this->getLibraryVersion()
	588	+ );
	589	+ if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
	590	+ $request->enableGzip();
	591	+ }
	592	+ $request->maybeMoveParametersToBody();
	593	+ return Google_Http_REST::execute($this, $request);
	594	+ } else if ($request instanceof Google_Http_Batch) {
	595	+ return $request->execute();
	596	+ } else {
	597	+ throw new Google_Exception("Do not know how to execute this type of object.");
	598	+ }
599	599	}
600	600
601	601	/**
		@@ -604,7 +604,7 @@ discard block
		block discarded – undo
604	604	*/
605	605	public function shouldDefer()
606	606	{
607		- return $this->deferExecution;
	607	+ return $this->deferExecution;
608	608	}
609	609
610	610	/**
		@@ -612,11 +612,11 @@ discard block
		block discarded – undo
612	612	*/
613	613	public function getAuth()
614	614	{
615		- if (!isset($this->auth)) {
616		- $class = $this->config->getAuthClass();
617		- $this->auth = new $class($this);
618		- }
619		- return $this->auth;
	615	+ if (!isset($this->auth)) {
	616	+ $class = $this->config->getAuthClass();
	617	+ $this->auth = new $class($this);
	618	+ }
	619	+ return $this->auth;
620	620	}
621	621
622	622	/**
		@@ -624,11 +624,11 @@ discard block
		block discarded – undo
624	624	*/
625	625	public function getIo()
626	626	{
627		- if (!isset($this->io)) {
628		- $class = $this->config->getIoClass();
629		- $this->io = new $class($this);
630		- }
631		- return $this->io;
	627	+ if (!isset($this->io)) {
	628	+ $class = $this->config->getIoClass();
	629	+ $this->io = new $class($this);
	630	+ }
	631	+ return $this->io;
632	632	}
633	633
634	634	/**
		@@ -636,11 +636,11 @@ discard block
		block discarded – undo
636	636	*/
637	637	public function getCache()
638	638	{
639		- if (!isset($this->cache)) {
640		- $class = $this->config->getCacheClass();
641		- $this->cache = new $class($this);
642		- }
643		- return $this->cache;
	639	+ if (!isset($this->cache)) {
	640	+ $class = $this->config->getCacheClass();
	641	+ $this->cache = new $class($this);
	642	+ }
	643	+ return $this->cache;
644	644	}
645	645
646	646	/**
		@@ -648,11 +648,11 @@ discard block
		block discarded – undo
648	648	*/
649	649	public function getLogger()
650	650	{
651		- if (!isset($this->logger)) {
652		- $class = $this->config->getLoggerClass();
653		- $this->logger = new $class($this);
654		- }
655		- return $this->logger;
	651	+ if (!isset($this->logger)) {
	652	+ $class = $this->config->getLoggerClass();
	653	+ $this->logger = new $class($this);
	654	+ }
	655	+ return $this->logger;
656	656	}
657	657
658	658	/**
		@@ -663,10 +663,10 @@ discard block
		block discarded – undo
663	663	*/
664	664	public function getClassConfig($class, $key = null)
665	665	{
666		- if (!is_string($class)) {
667		- $class = get_class($class);
668		- }
669		- return $this->config->getClassConfig($class, $key);
	666	+ if (!is_string($class)) {
	667	+ $class = get_class($class);
	668	+ }
	669	+ return $this->config->getClassConfig($class, $key);
670	670	}
671	671
672	672	/**
		@@ -680,10 +680,10 @@ discard block
		block discarded – undo
680	680	*/
681	681	public function setClassConfig($class, $config, $value = null)
682	682	{
683		- if (!is_string($class)) {
684		- $class = get_class($class);
685		- }
686		- $this->config->setClassConfig($class, $config, $value);
	683	+ if (!is_string($class)) {
	684	+ $class = get_class($class);
	685	+ }
	686	+ $this->config->setClassConfig($class, $config, $value);
687	687
688	688	}
689	689
		@@ -692,7 +692,7 @@ discard block
		block discarded – undo
692	692	*/
693	693	public function getBasePath()
694	694	{
695		- return $this->config->getBasePath();
	695	+ return $this->config->getBasePath();
696	696	}
697	697
698	698	/**
		@@ -700,7 +700,7 @@ discard block
		block discarded – undo
700	700	*/
701	701	public function getApplicationName()
702	702	{
703		- return $this->config->getApplicationName();
	703	+ return $this->config->getApplicationName();
704	704	}
705	705
706	706	/**
		@@ -709,7 +709,7 @@ discard block
		block discarded – undo
709	709	*/
710	710	public function isAppEngine()
711	711	{
712		- return (isset($_SERVER['SERVER_SOFTWARE']) &&
713		- strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
	712	+ return (isset($_SERVER['SERVER_SOFTWARE']) &&
	713	+ strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
714	714	}
715	715	}

		@@ -79,7 +79,7 @@ discard block
		block discarded – undo
79	79
80	80	/**
81	81	* Set the base URL that path and query parameters will be added to.
82		- * @param $baseComponent string
	82	+ * @param string $baseComponent string
83	83	*/
84	84	public function setBaseComponent($baseComponent)
85	85	{
		@@ -132,7 +132,7 @@ discard block
		block discarded – undo
132	132
133	133	/**
134	134	* Set a new query parameter.
135		- * @param $key - string to set, does not need to be URL encoded
	135	+ * @param string $key - string to set, does not need to be URL encoded
136	136	* @param $value - string to set, does not need to be URL encoded
137	137	*/
138	138	public function setQueryParam($key, $value)
		@@ -141,7 +141,7 @@ discard block
		block discarded – undo
141	141	}
142	142
143	143	/**
144		- * @return string HTTP Response Code.
	144	+ * @return integer HTTP Response Code.
145	145	*/
146	146	public function getResponseHttpCode()
147	147	{

		@@ -32,9 +32,9 @@ discard block
		block discarded – undo
32	32	const GZIP_UA = " (gzip)";
33	33
34	34	private $batchHeaders = array(
35		- 'Content-Type' => 'application/http',
36		- 'Content-Transfer-Encoding' => 'binary',
37		- 'MIME-Version' => '1.0',
	35	+ 'Content-Type' => 'application/http',
	36	+ 'Content-Transfer-Encoding' => 'binary',
	37	+ 'MIME-Version' => '1.0',
38	38	);
39	39
40	40	protected $queryParams;
		@@ -56,15 +56,15 @@ discard block
		block discarded – undo
56	56	public $accessKey;
57	57
58	58	public function __construct(
59		- $url,
60		- $method = 'GET',
61		- $headers = array(),
62		- $postBody = null
	59	+ $url,
	60	+ $method = 'GET',
	61	+ $headers = array(),
	62	+ $postBody = null
63	63	) {
64		- $this->setUrl($url);
65		- $this->setRequestMethod($method);
66		- $this->setRequestHeaders($headers);
67		- $this->setPostBody($postBody);
	64	+ $this->setUrl($url);
	65	+ $this->setRequestMethod($method);
	66	+ $this->setRequestHeaders($headers);
	67	+ $this->setPostBody($postBody);
68	68	}
69	69
70	70	/**
		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	*/
75	75	public function getBaseComponent()
76	76	{
77		- return $this->baseComponent;
	77	+ return $this->baseComponent;
78	78	}
79	79
80	80	/**
		@@ -83,7 +83,7 @@ discard block
		block discarded – undo
83	83	*/
84	84	public function setBaseComponent($baseComponent)
85	85	{
86		- $this->baseComponent = rtrim($baseComponent, '/');
	86	+ $this->baseComponent = rtrim($baseComponent, '/');
87	87	}
88	88
89	89	/**
		@@ -91,9 +91,9 @@ discard block
		block discarded – undo
91	91	*/
92	92	public function enableGzip()
93	93	{
94		- $this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
95		- $this->canGzip = true;
96		- $this->setUserAgent($this->userAgent);
	94	+ $this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
	95	+ $this->canGzip = true;
	96	+ $this->setUserAgent($this->userAgent);
97	97	}
98	98
99	99	/**
		@@ -101,14 +101,14 @@ discard block
		block discarded – undo
101	101	*/
102	102	public function disableGzip()
103	103	{
104		- if (
105		- isset($this->requestHeaders['accept-encoding']) &&
106		- $this->requestHeaders['accept-encoding'] == "gzip"
107		- ) {
108		- unset($this->requestHeaders['accept-encoding']);
109		- }
110		- $this->canGzip = false;
111		- $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
	104	+ if (
	105	+ isset($this->requestHeaders['accept-encoding']) &&
	106	+ $this->requestHeaders['accept-encoding'] == "gzip"
	107	+ ) {
	108	+ unset($this->requestHeaders['accept-encoding']);
	109	+ }
	110	+ $this->canGzip = false;
	111	+ $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
112	112	}
113	113
114	114	/**
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	*/
118	118	public function canGzip()
119	119	{
120		- return $this->canGzip;
	120	+ return $this->canGzip;
121	121	}
122	122
123	123	/**
		@@ -127,7 +127,7 @@ discard block
		block discarded – undo
127	127	*/
128	128	public function getQueryParams()
129	129	{
130		- return $this->queryParams;
	130	+ return $this->queryParams;
131	131	}
132	132
133	133	/**
		@@ -137,7 +137,7 @@ discard block
		block discarded – undo
137	137	*/
138	138	public function setQueryParam($key, $value)
139	139	{
140		- $this->queryParams[$key] = $value;
	140	+ $this->queryParams[$key] = $value;
141	141	}
142	142
143	143	/**
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	*/
146	146	public function getResponseHttpCode()
147	147	{
148		- return (int) $this->responseHttpCode;
	148	+ return (int) $this->responseHttpCode;
149	149	}
150	150
151	151	/**
		@@ -153,7 +153,7 @@ discard block
		block discarded – undo
153	153	*/
154	154	public function setResponseHttpCode($responseHttpCode)
155	155	{
156		- $this->responseHttpCode = $responseHttpCode;
	156	+ $this->responseHttpCode = $responseHttpCode;
157	157	}
158	158
159	159	/**
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	*/
162	162	public function getResponseHeaders()
163	163	{
164		- return $this->responseHeaders;
	164	+ return $this->responseHeaders;
165	165	}
166	166
167	167	/**
		@@ -169,7 +169,7 @@ discard block
		block discarded – undo
169	169	*/
170	170	public function getResponseBody()
171	171	{
172		- return $this->responseBody;
	172	+ return $this->responseBody;
173	173	}
174	174
175	175	/**
		@@ -179,7 +179,7 @@ discard block
		block discarded – undo
179	179	*/
180	180	public function setExpectedClass($class)
181	181	{
182		- $this->expectedClass = $class;
	182	+ $this->expectedClass = $class;
183	183	}
184	184
185	185	/**
		@@ -188,7 +188,7 @@ discard block
		block discarded – undo
188	188	*/
189	189	public function getExpectedClass()
190	190	{
191		- return $this->expectedClass;
	191	+ return $this->expectedClass;
192	192	}
193	193
194	194	/**
		@@ -196,7 +196,7 @@ discard block
		block discarded – undo
196	196	*/
197	197	public function enableExpectedRaw()
198	198	{
199		- $this->expectedRaw = true;
	199	+ $this->expectedRaw = true;
200	200	}
201	201
202	202	/**
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	*/
205	205	public function disableExpectedRaw()
206	206	{
207		- $this->expectedRaw = false;
	207	+ $this->expectedRaw = false;
208	208	}
209	209
210	210	/**
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	*/
214	214	public function getExpectedRaw()
215	215	{
216		- return $this->expectedRaw;
	216	+ return $this->expectedRaw;
217	217	}
218	218
219	219	/**
		@@ -222,12 +222,12 @@ discard block
		block discarded – undo
222	222	*/
223	223	public function setResponseHeaders($headers)
224	224	{
225		- $headers = Google_Utils::normalize($headers);
226		- if ($this->responseHeaders) {
227		- $headers = array_merge($this->responseHeaders, $headers);
228		- }
	225	+ $headers = Google_Utils::normalize($headers);
	226	+ if ($this->responseHeaders) {
	227	+ $headers = array_merge($this->responseHeaders, $headers);
	228	+ }
229	229
230		- $this->responseHeaders = $headers;
	230	+ $this->responseHeaders = $headers;
231	231	}
232	232
233	233	/**
		@@ -237,9 +237,9 @@ discard block
		block discarded – undo
237	237	*/
238	238	public function getResponseHeader($key)
239	239	{
240		- return isset($this->responseHeaders[$key])
241		- ? $this->responseHeaders[$key]
242		- : false;
	240	+ return isset($this->responseHeaders[$key])
	241	+ ? $this->responseHeaders[$key]
	242	+ : false;
243	243	}
244	244
245	245	/**
		@@ -247,7 +247,7 @@ discard block
		block discarded – undo
247	247	*/
248	248	public function setResponseBody($responseBody)
249	249	{
250		- $this->responseBody = $responseBody;
	250	+ $this->responseBody = $responseBody;
251	251	}
252	252
253	253	/**
		@@ -255,10 +255,10 @@ discard block
		block discarded – undo
255	255	*/
256	256	public function getUrl()
257	257	{
258		- return $this->baseComponent . $this->path .
259		- (count($this->queryParams) ?
260		- "?" . $this->buildQuery($this->queryParams) :
261		- '');
	258	+ return $this->baseComponent . $this->path .
	259	+ (count($this->queryParams) ?
	260	+ "?" . $this->buildQuery($this->queryParams) :
	261	+ '');
262	262	}
263	263
264	264	/**
		@@ -266,7 +266,7 @@ discard block
		block discarded – undo
266	266	*/
267	267	public function getRequestMethod()
268	268	{
269		- return $this->requestMethod;
	269	+ return $this->requestMethod;
270	270	}
271	271
272	272	/**
		@@ -274,7 +274,7 @@ discard block
		block discarded – undo
274	274	*/
275	275	public function getRequestHeaders()
276	276	{
277		- return $this->requestHeaders;
	277	+ return $this->requestHeaders;
278	278	}
279	279
280	280	/**
		@@ -284,9 +284,9 @@ discard block
		block discarded – undo
284	284	*/
285	285	public function getRequestHeader($key)
286	286	{
287		- return isset($this->requestHeaders[$key])
288		- ? $this->requestHeaders[$key]
289		- : false;
	287	+ return isset($this->requestHeaders[$key])
	288	+ ? $this->requestHeaders[$key]
	289	+ : false;
290	290	}
291	291
292	292	/**
		@@ -294,7 +294,7 @@ discard block
		block discarded – undo
294	294	*/
295	295	public function getPostBody()
296	296	{
297		- return $this->postBody;
	297	+ return $this->postBody;
298	298	}
299	299
300	300	/**
		@@ -302,26 +302,26 @@ discard block
		block discarded – undo
302	302	*/
303	303	public function setUrl($url)
304	304	{
305		- if (substr($url, 0, 4) != 'http') {
306		- // Force the path become relative.
307		- if (substr($url, 0, 1) !== '/') {
308		- $url = '/' . $url;
309		- }
310		- }
311		- $parts = parse_url($url);
312		- if (isset($parts['host'])) {
313		- $this->baseComponent = sprintf(
314		- "%s%s%s",
315		- isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
316		- isset($parts['host']) ? $parts['host'] : '',
317		- isset($parts['port']) ? ":" . $parts['port'] : ''
318		- );
319		- }
320		- $this->path = isset($parts['path']) ? $parts['path'] : '';
321		- $this->queryParams = array();
322		- if (isset($parts['query'])) {
323		- $this->queryParams = $this->parseQuery($parts['query']);
324		- }
	305	+ if (substr($url, 0, 4) != 'http') {
	306	+ // Force the path become relative.
	307	+ if (substr($url, 0, 1) !== '/') {
	308	+ $url = '/' . $url;
	309	+ }
	310	+ }
	311	+ $parts = parse_url($url);
	312	+ if (isset($parts['host'])) {
	313	+ $this->baseComponent = sprintf(
	314	+ "%s%s%s",
	315	+ isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
	316	+ isset($parts['host']) ? $parts['host'] : '',
	317	+ isset($parts['port']) ? ":" . $parts['port'] : ''
	318	+ );
	319	+ }
	320	+ $this->path = isset($parts['path']) ? $parts['path'] : '';
	321	+ $this->queryParams = array();
	322	+ if (isset($parts['query'])) {
	323	+ $this->queryParams = $this->parseQuery($parts['query']);
	324	+ }
325	325	}
326	326
327	327	/**
		@@ -331,7 +331,7 @@ discard block
		block discarded – undo
331	331	*/
332	332	public function setRequestMethod($method)
333	333	{
334		- $this->requestMethod = strtoupper($method);
	334	+ $this->requestMethod = strtoupper($method);
335	335	}
336	336
337	337	/**
		@@ -340,11 +340,11 @@ discard block
		block discarded – undo
340	340	*/
341	341	public function setRequestHeaders($headers)
342	342	{
343		- $headers = Google_Utils::normalize($headers);
344		- if ($this->requestHeaders) {
345		- $headers = array_merge($this->requestHeaders, $headers);
346		- }
347		- $this->requestHeaders = $headers;
	343	+ $headers = Google_Utils::normalize($headers);
	344	+ if ($this->requestHeaders) {
	345	+ $headers = array_merge($this->requestHeaders, $headers);
	346	+ }
	347	+ $this->requestHeaders = $headers;
348	348	}
349	349
350	350	/**
		@@ -352,7 +352,7 @@ discard block
		block discarded – undo
352	352	*/
353	353	public function setPostBody($postBody)
354	354	{
355		- $this->postBody = $postBody;
	355	+ $this->postBody = $postBody;
356	356	}
357	357
358	358	/**
		@@ -361,10 +361,10 @@ discard block
		block discarded – undo
361	361	*/
362	362	public function setUserAgent($userAgent)
363	363	{
364		- $this->userAgent = $userAgent;
365		- if ($this->canGzip) {
366		- $this->userAgent = $userAgent . self::GZIP_UA;
367		- }
	364	+ $this->userAgent = $userAgent;
	365	+ if ($this->canGzip) {
	366	+ $this->userAgent = $userAgent . self::GZIP_UA;
	367	+ }
368	368	}
369	369
370	370	/**
		@@ -372,7 +372,7 @@ discard block
		block discarded – undo
372	372	*/
373	373	public function getUserAgent()
374	374	{
375		- return $this->userAgent;
	375	+ return $this->userAgent;
376	376	}
377	377
378	378	/**
		@@ -383,29 +383,29 @@ discard block
		block discarded – undo
383	383	*/
384	384	public function getCacheKey()
385	385	{
386		- $key = $this->getUrl();
	386	+ $key = $this->getUrl();
387	387
388		- if (isset($this->accessKey)) {
389		- $key .= $this->accessKey;
390		- }
	388	+ if (isset($this->accessKey)) {
	389	+ $key .= $this->accessKey;
	390	+ }
391	391
392		- if (isset($this->requestHeaders['authorization'])) {
393		- $key .= $this->requestHeaders['authorization'];
394		- }
	392	+ if (isset($this->requestHeaders['authorization'])) {
	393	+ $key .= $this->requestHeaders['authorization'];
	394	+ }
395	395
396		- return md5($key);
	396	+ return md5($key);
397	397	}
398	398
399	399	public function getParsedCacheControl()
400	400	{
401		- $parsed = array();
402		- $rawCacheControl = $this->getResponseHeader('cache-control');
403		- if ($rawCacheControl) {
404		- $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
405		- parse_str($rawCacheControl, $parsed);
406		- }
	401	+ $parsed = array();
	402	+ $rawCacheControl = $this->getResponseHeader('cache-control');
	403	+ if ($rawCacheControl) {
	404	+ $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
	405	+ parse_str($rawCacheControl, $parsed);
	406	+ }
407	407
408		- return $parsed;
	408	+ return $parsed;
409	409	}
410	410
411	411	/**
		@@ -414,29 +414,29 @@ discard block
		block discarded – undo
414	414	*/
415	415	public function toBatchString($id)
416	416	{
417		- $str = '';
418		- $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
419		- http_build_query($this->queryParams);
420		- $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
	417	+ $str = '';
	418	+ $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
	419	+ http_build_query($this->queryParams);
	420	+ $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
421	421
422		- foreach ($this->getRequestHeaders() as $key => $val) {
423		- $str .= $key . ': ' . $val . "\n";
424		- }
	422	+ foreach ($this->getRequestHeaders() as $key => $val) {
	423	+ $str .= $key . ': ' . $val . "\n";
	424	+ }
425	425
426		- if ($this->getPostBody()) {
427		- $str .= "\n";
428		- $str .= $this->getPostBody();
429		- }
	426	+ if ($this->getPostBody()) {
	427	+ $str .= "\n";
	428	+ $str .= $this->getPostBody();
	429	+ }
430	430
431		- $headers = '';
432		- foreach ($this->batchHeaders as $key => $val) {
433		- $headers .= $key . ': ' . $val . "\n";
434		- }
	431	+ $headers = '';
	432	+ foreach ($this->batchHeaders as $key => $val) {
	433	+ $headers .= $key . ': ' . $val . "\n";
	434	+ }
435	435
436		- $headers .= "Content-ID: $id\n";
437		- $str = $headers . "\n" . $str;
	436	+ $headers .= "Content-ID: $id\n";
	437	+ $str = $headers . "\n" . $str;
438	438
439		- return $str;
	439	+ return $str;
440	440	}
441	441
442	442	/**
		@@ -446,21 +446,21 @@ discard block
		block discarded – undo
446	446	*/
447	447	private function parseQuery($string)
448	448	{
449		- $return = array();
450		- $parts = explode("&", $string);
451		- foreach ($parts as $part) {
452		- list($key, $value) = explode('=', $part, 2);
453		- $value = urldecode($value);
454		- if (isset($return[$key])) {
455		- if (!is_array($return[$key])) {
456		- $return[$key] = array($return[$key]);
457		- }
458		- $return[$key][] = $value;
459		- } else {
460		- $return[$key] = $value;
461		- }
462		- }
463		- return $return;
	449	+ $return = array();
	450	+ $parts = explode("&", $string);
	451	+ foreach ($parts as $part) {
	452	+ list($key, $value) = explode('=', $part, 2);
	453	+ $value = urldecode($value);
	454	+ if (isset($return[$key])) {
	455	+ if (!is_array($return[$key])) {
	456	+ $return[$key] = array($return[$key]);
	457	+ }
	458	+ $return[$key][] = $value;
	459	+ } else {
	460	+ $return[$key] = $value;
	461	+ }
	462	+ }
	463	+ return $return;
464	464	}
465	465
466	466	/**
		@@ -470,17 +470,17 @@ discard block
		block discarded – undo
470	470	*/
471	471	private function buildQuery($parts)
472	472	{
473		- $return = array();
474		- foreach ($parts as $key => $value) {
475		- if (is_array($value)) {
476		- foreach ($value as $v) {
477		- $return[] = urlencode($key) . "=" . urlencode($v);
478		- }
479		- } else {
480		- $return[] = urlencode($key) . "=" . urlencode($value);
481		- }
482		- }
483		- return implode('&', $return);
	473	+ $return = array();
	474	+ foreach ($parts as $key => $value) {
	475	+ if (is_array($value)) {
	476	+ foreach ($value as $v) {
	477	+ $return[] = urlencode($key) . "=" . urlencode($v);
	478	+ }
	479	+ } else {
	480	+ $return[] = urlencode($key) . "=" . urlencode($value);
	481	+ }
	482	+ }
	483	+ return implode('&', $return);
484	484	}
485	485
486	486	/**
		@@ -490,15 +490,15 @@ discard block
		block discarded – undo
490	490	*/
491	491	public function maybeMoveParametersToBody()
492	492	{
493		- if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
494		- $this->setRequestHeaders(
495		- array(
496		- "content-type" =>
497		- "application/x-www-form-urlencoded; charset=UTF-8"
498		- )
499		- );
500		- $this->setPostBody($this->buildQuery($this->queryParams));
501		- $this->queryParams = array();
502		- }
	493	+ if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
	494	+ $this->setRequestHeaders(
	495	+ array(
	496	+ "content-type" =>
	497	+ "application/x-www-form-urlencoded; charset=UTF-8"
	498	+ )
	499	+ );
	500	+ $this->setPostBody($this->buildQuery($this->queryParams));
	501	+ $this->queryParams = array();
	502	+ }
503	503	}
504	504	}

		@@ -261,7 +261,7 @@ discard block
		block discarded – undo
261	261	/**
262	262	* Logs with an arbitrary level.
263	263	*
264		- * @param mixed $level The log level
	264	+ * @param string $level The log level
265	265	* @param string $message The log message
266	266	* @param array $context The log context
267	267	*/
		@@ -380,7 +380,7 @@ discard block
		block discarded – undo
380	380	/**
381	381	* Converts a given log level to the integer form.
382	382	*
383		- * @param mixed $level The logging level
	383	+ * @param integer $level The logging level
384	384	* @return integer $level The normalized level
385	385	* @throws Google_Logger_Exception If $level is invalid
386	386	*/

		@@ -88,14 +88,14 @@ discard block
		block discarded – undo
88	88	* @var array $levels Logging levels
89	89	*/
90	90	protected static $levels = array(
91		- self::EMERGENCY => 600,
92		- self::ALERT => 550,
93		- self::CRITICAL => 500,
94		- self::ERROR => 400,
95		- self::WARNING => 300,
96		- self::NOTICE => 250,
97		- self::INFO => 200,
98		- self::DEBUG => 100,
	91	+ self::EMERGENCY => 600,
	92	+ self::ALERT => 550,
	93	+ self::CRITICAL => 500,
	94	+ self::ERROR => 400,
	95	+ self::WARNING => 300,
	96	+ self::NOTICE => 250,
	97	+ self::INFO => 200,
	98	+ self::DEBUG => 100,
99	99	);
100	100
101	101	/**
		@@ -122,20 +122,20 @@ discard block
		block discarded – undo
122	122	*/
123	123	public function __construct(Google_Client $client)
124	124	{
125		- $this->setLevel(
126		- $client->getClassConfig('Google_Logger_Abstract', 'level')
127		- );
	125	+ $this->setLevel(
	126	+ $client->getClassConfig('Google_Logger_Abstract', 'level')
	127	+ );
128	128
129		- $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
130		- $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
	129	+ $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
	130	+ $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
131	131
132		- $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
133		- $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
	132	+ $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
	133	+ $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
134	134
135		- $this->allowNewLines = (bool) $client->getClassConfig(
136		- 'Google_Logger_Abstract',
137		- 'allow_newlines'
138		- );
	135	+ $this->allowNewLines = (bool) $client->getClassConfig(
	136	+ 'Google_Logger_Abstract',
	137	+ 'allow_newlines'
	138	+ );
139	139	}
140	140
141	141	/**
		@@ -145,7 +145,7 @@ discard block
		block discarded – undo
145	145	*/
146	146	public function setLevel($level)
147	147	{
148		- $this->level = $this->normalizeLevel($level);
	148	+ $this->level = $this->normalizeLevel($level);
149	149	}
150	150
151	151	/**
		@@ -156,7 +156,7 @@ discard block
		block discarded – undo
156	156	*/
157	157	public function shouldHandle($level)
158	158	{
159		- return $this->normalizeLevel($level) >= $this->level;
	159	+ return $this->normalizeLevel($level) >= $this->level;
160	160	}
161	161
162	162	/**
		@@ -167,7 +167,7 @@ discard block
		block discarded – undo
167	167	*/
168	168	public function emergency($message, array $context = array())
169	169	{
170		- $this->log(self::EMERGENCY, $message, $context);
	170	+ $this->log(self::EMERGENCY, $message, $context);
171	171	}
172	172
173	173	/**
		@@ -181,7 +181,7 @@ discard block
		block discarded – undo
181	181	*/
182	182	public function alert($message, array $context = array())
183	183	{
184		- $this->log(self::ALERT, $message, $context);
	184	+ $this->log(self::ALERT, $message, $context);
185	185	}
186	186
187	187	/**
		@@ -194,7 +194,7 @@ discard block
		block discarded – undo
194	194	*/
195	195	public function critical($message, array $context = array())
196	196	{
197		- $this->log(self::CRITICAL, $message, $context);
	197	+ $this->log(self::CRITICAL, $message, $context);
198	198	}
199	199
200	200	/**
		@@ -206,7 +206,7 @@ discard block
		block discarded – undo
206	206	*/
207	207	public function error($message, array $context = array())
208	208	{
209		- $this->log(self::ERROR, $message, $context);
	209	+ $this->log(self::ERROR, $message, $context);
210	210	}
211	211
212	212	/**
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	*/
221	221	public function warning($message, array $context = array())
222	222	{
223		- $this->log(self::WARNING, $message, $context);
	223	+ $this->log(self::WARNING, $message, $context);
224	224	}
225	225
226	226	/**
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231	*/
232	232	public function notice($message, array $context = array())
233	233	{
234		- $this->log(self::NOTICE, $message, $context);
	234	+ $this->log(self::NOTICE, $message, $context);
235	235	}
236	236
237	237	/**
		@@ -244,7 +244,7 @@ discard block
		block discarded – undo
244	244	*/
245	245	public function info($message, array $context = array())
246	246	{
247		- $this->log(self::INFO, $message, $context);
	247	+ $this->log(self::INFO, $message, $context);
248	248	}
249	249
250	250	/**
		@@ -255,7 +255,7 @@ discard block
		block discarded – undo
255	255	*/
256	256	public function debug($message, array $context = array())
257	257	{
258		- $this->log(self::DEBUG, $message, $context);
	258	+ $this->log(self::DEBUG, $message, $context);
259	259	}
260	260
261	261	/**
		@@ -267,21 +267,21 @@ discard block
		block discarded – undo
267	267	*/
268	268	public function log($level, $message, array $context = array())
269	269	{
270		- if (!$this->shouldHandle($level)) {
271		- return false;
272		- }
273		-
274		- $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
275		- $message = $this->interpolate(
276		- array(
277		- 'message' => $message,
278		- 'context' => $context,
279		- 'level' => strtoupper($levelName),
280		- 'datetime' => new DateTime(),
281		- )
282		- );
283		-
284		- $this->write($message);
	270	+ if (!$this->shouldHandle($level)) {
	271	+ return false;
	272	+ }
	273	+
	274	+ $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
	275	+ $message = $this->interpolate(
	276	+ array(
	277	+ 'message' => $message,
	278	+ 'context' => $context,
	279	+ 'level' => strtoupper($levelName),
	280	+ 'datetime' => new DateTime(),
	281	+ )
	282	+ );
	283	+
	284	+ $this->write($message);
285	285	}
286	286
287	287	/**
		@@ -292,26 +292,26 @@ discard block
		block discarded – undo
292	292	*/
293	293	protected function interpolate(array $variables = array())
294	294	{
295		- $template = $this->logFormat;
296		-
297		- if (!$variables['context']) {
298		- $template = str_replace('%context%', '', $template);
299		- unset($variables['context']);
300		- } else {
301		- $this->reverseJsonInContext($variables['context']);
302		- }
303		-
304		- foreach ($variables as $key => $value) {
305		- if (strpos($template, '%'. $key .'%') !== false) {
306		- $template = str_replace(
307		- '%' . $key . '%',
308		- $this->export($value),
309		- $template
310		- );
311		- }
312		- }
313		-
314		- return $template;
	295	+ $template = $this->logFormat;
	296	+
	297	+ if (!$variables['context']) {
	298	+ $template = str_replace('%context%', '', $template);
	299	+ unset($variables['context']);
	300	+ } else {
	301	+ $this->reverseJsonInContext($variables['context']);
	302	+ }
	303	+
	304	+ foreach ($variables as $key => $value) {
	305	+ if (strpos($template, '%'. $key .'%') !== false) {
	306	+ $template = str_replace(
	307	+ '%' . $key . '%',
	308	+ $this->export($value),
	309	+ $template
	310	+ );
	311	+ }
	312	+ }
	313	+
	314	+ return $template;
315	315	}
316	316
317	317	/**
		@@ -321,20 +321,20 @@ discard block
		block discarded – undo
321	321	*/
322	322	protected function reverseJsonInContext(array &$context)
323	323	{
324		- if (!$context) {
325		- return;
326		- }
327		-
328		- foreach ($context as $key => $val) {
329		- if (!$val \|\| !is_string($val) \|\| !($val[0] == '{' \|\| $val[0] == '[')) {
330		- continue;
331		- }
332		-
333		- $json = @json_decode($val);
334		- if (is_object($json) \|\| is_array($json)) {
335		- $context[$key] = $json;
336		- }
337		- }
	324	+ if (!$context) {
	325	+ return;
	326	+ }
	327	+
	328	+ foreach ($context as $key => $val) {
	329	+ if (!$val \|\| !is_string($val) \|\| !($val[0] == '{' \|\| $val[0] == '[')) {
	330	+ continue;
	331	+ }
	332	+
	333	+ $json = @json_decode($val);
	334	+ if (is_object($json) \|\| is_array($json)) {
	335	+ $context[$key] = $json;
	336	+ }
	337	+ }
338	338	}
339	339
340	340	/**
		@@ -344,37 +344,37 @@ discard block
		block discarded – undo
344	344	*/
345	345	protected function export($value)
346	346	{
347		- if (is_string($value)) {
348		- if ($this->allowNewLines) {
349		- return $value;
350		- }
	347	+ if (is_string($value)) {
	348	+ if ($this->allowNewLines) {
	349	+ return $value;
	350	+ }
351	351
352		- return preg_replace('/[\r\n]+/', ' ', $value);
353		- }
	352	+ return preg_replace('/[\r\n]+/', ' ', $value);
	353	+ }
354	354
355		- if (is_resource($value)) {
356		- return sprintf(
357		- 'resource(%d) of type (%s)',
358		- $value,
359		- get_resource_type($value)
360		- );
361		- }
	355	+ if (is_resource($value)) {
	356	+ return sprintf(
	357	+ 'resource(%d) of type (%s)',
	358	+ $value,
	359	+ get_resource_type($value)
	360	+ );
	361	+ }
362	362
363		- if ($value instanceof DateTime) {
364		- return $value->format($this->dateFormat);
365		- }
	363	+ if ($value instanceof DateTime) {
	364	+ return $value->format($this->dateFormat);
	365	+ }
366	366
367		- if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
368		- $options = JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE;
	367	+ if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
	368	+ $options = JSON_UNESCAPED_SLASHES \| JSON_UNESCAPED_UNICODE;
369	369
370		- if ($this->allowNewLines) {
371		- $options \|= JSON_PRETTY_PRINT;
372		- }
	370	+ if ($this->allowNewLines) {
	371	+ $options \|= JSON_PRETTY_PRINT;
	372	+ }
373	373
374		- return @json_encode($value, $options);
375		- }
	374	+ return @json_encode($value, $options);
	375	+ }
376	376
377		- return str_replace('\\/', '/', @json_encode($value));
	377	+ return str_replace('\\/', '/', @json_encode($value));
378	378	}
379	379
380	380	/**
		@@ -386,17 +386,17 @@ discard block
		block discarded – undo
386	386	*/
387	387	protected function normalizeLevel($level)
388	388	{
389		- if (is_int($level) && array_search($level, self::$levels) !== false) {
390		- return $level;
391		- }
	389	+ if (is_int($level) && array_search($level, self::$levels) !== false) {
	390	+ return $level;
	391	+ }
392	392
393		- if (is_string($level) && isset(self::$levels[$level])) {
394		- return self::$levels[$level];
395		- }
	393	+ if (is_string($level) && isset(self::$levels[$level])) {
	394	+ return self::$levels[$level];
	395	+ }
396	396
397		- throw new Google_Logger_Exception(
398		- sprintf("Unknown LogLevel: '%s'", $level)
399		- );
	397	+ throw new Google_Logger_Exception(
	398	+ sprintf("Unknown LogLevel: '%s'", $level)
	399	+ );
400	400	}
401	401
402	402	/**

		@@ -221,7 +221,7 @@ discard block
		block discarded – undo
221	221	/**
222	222	* Given a variable name, discover its type.
223	223	*
224		- * @param $name
	224	+ * @param string $name
225	225	* @param $item
226	226	* @return object The object from the item.
227	227	*/
		@@ -278,6 +278,9 @@ discard block
		block discarded – undo
278	278	return $key . "Type";
279	279	}
280	280
	281	+ /**
	282	+ * @param string $key
	283	+ */
281	284	protected function dataType($key)
282	285	{
283	286	return $key . "DataType";

		@@ -38,12 +38,12 @@ discard block
		block discarded – undo
38	38	*/
39	39	final public function __construct()
40	40	{
41		- if (func_num_args() == 1 && is_array(func_get_arg(0))) {
42		- // Initialize the model with the array's contents.
43		- $array = func_get_arg(0);
44		- $this->mapTypes($array);
45		- }
46		- $this->gapiInit();
	41	+ if (func_num_args() == 1 && is_array(func_get_arg(0))) {
	42	+ // Initialize the model with the array's contents.
	43	+ $array = func_get_arg(0);
	44	+ $this->mapTypes($array);
	45	+ }
	46	+ $this->gapiInit();
47	47	}
48	48
49	49	/**
		@@ -53,39 +53,39 @@ discard block
		block discarded – undo
53	53	*/
54	54	public function __get($key)
55	55	{
56		- $keyTypeName = $this->keyType($key);
57		- $keyDataType = $this->dataType($key);
58		- if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
59		- if (isset($this->modelData[$key])) {
60		- $val = $this->modelData[$key];
61		- } else if (isset($this->$keyDataType) &&
62		- ($this->$keyDataType == 'array' \|\| $this->$keyDataType == 'map')) {
63		- $val = array();
64		- } else {
65		- $val = null;
66		- }
	56	+ $keyTypeName = $this->keyType($key);
	57	+ $keyDataType = $this->dataType($key);
	58	+ if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
	59	+ if (isset($this->modelData[$key])) {
	60	+ $val = $this->modelData[$key];
	61	+ } else if (isset($this->$keyDataType) &&
	62	+ ($this->$keyDataType == 'array' \|\| $this->$keyDataType == 'map')) {
	63	+ $val = array();
	64	+ } else {
	65	+ $val = null;
	66	+ }
67	67
68		- if ($this->isAssociativeArray($val)) {
69		- if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
70		- foreach ($val as $arrayKey => $arrayItem) {
71		- $this->modelData[$key][$arrayKey] =
72		- $this->createObjectFromName($keyTypeName, $arrayItem);
73		- }
74		- } else {
75		- $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
76		- }
77		- } else if (is_array($val)) {
78		- $arrayObject = array();
79		- foreach ($val as $arrayIndex => $arrayItem) {
80		- $arrayObject[$arrayIndex] =
81		- $this->createObjectFromName($keyTypeName, $arrayItem);
82		- }
83		- $this->modelData[$key] = $arrayObject;
84		- }
85		- $this->processed[$key] = true;
86		- }
	68	+ if ($this->isAssociativeArray($val)) {
	69	+ if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
	70	+ foreach ($val as $arrayKey => $arrayItem) {
	71	+ $this->modelData[$key][$arrayKey] =
	72	+ $this->createObjectFromName($keyTypeName, $arrayItem);
	73	+ }
	74	+ } else {
	75	+ $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
	76	+ }
	77	+ } else if (is_array($val)) {
	78	+ $arrayObject = array();
	79	+ foreach ($val as $arrayIndex => $arrayItem) {
	80	+ $arrayObject[$arrayIndex] =
	81	+ $this->createObjectFromName($keyTypeName, $arrayItem);
	82	+ }
	83	+ $this->modelData[$key] = $arrayObject;
	84	+ }
	85	+ $this->processed[$key] = true;
	86	+ }
87	87
88		- return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
	88	+ return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
89	89	}
90	90
91	91	/**
		@@ -96,19 +96,19 @@ discard block
		block discarded – undo
96	96	*/
97	97	protected function mapTypes($array)
98	98	{
99		- // Hard initialise simple types, lazy load more complex ones.
100		- foreach ($array as $key => $val) {
101		- if ( !property_exists($this, $this->keyType($key)) &&
102		- property_exists($this, $key)) {
103		- $this->$key = $val;
104		- unset($array[$key]);
105		- } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
106		- // This checks if property exists as camelCase, leaving it in array as snake_case
107		- // in case of backwards compatibility issues.
108		- $this->$camelKey = $val;
109		- }
110		- }
111		- $this->modelData = $array;
	99	+ // Hard initialise simple types, lazy load more complex ones.
	100	+ foreach ($array as $key => $val) {
	101	+ if ( !property_exists($this, $this->keyType($key)) &&
	102	+ property_exists($this, $key)) {
	103	+ $this->$key = $val;
	104	+ unset($array[$key]);
	105	+ } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
	106	+ // This checks if property exists as camelCase, leaving it in array as snake_case
	107	+ // in case of backwards compatibility issues.
	108	+ $this->$camelKey = $val;
	109	+ }
	110	+ }
	111	+ $this->modelData = $array;
112	112	}
113	113
114	114	/**
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	*/
119	119	protected function gapiInit()
120	120	{
121		- return;
	121	+ return;
122	122	}
123	123
124	124	/**
		@@ -129,29 +129,29 @@ discard block
		block discarded – undo
129	129	*/
130	130	public function toSimpleObject()
131	131	{
132		- $object = new stdClass();
	132	+ $object = new stdClass();
133	133
134		- // Process all other data.
135		- foreach ($this->modelData as $key => $val) {
136		- $result = $this->getSimpleValue($val);
137		- if ($result !== null) {
138		- $object->$key = $this->nullPlaceholderCheck($result);
139		- }
140		- }
	134	+ // Process all other data.
	135	+ foreach ($this->modelData as $key => $val) {
	136	+ $result = $this->getSimpleValue($val);
	137	+ if ($result !== null) {
	138	+ $object->$key = $this->nullPlaceholderCheck($result);
	139	+ }
	140	+ }
141	141
142		- // Process all public properties.
143		- $reflect = new ReflectionObject($this);
144		- $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
145		- foreach ($props as $member) {
146		- $name = $member->getName();
147		- $result = $this->getSimpleValue($this->$name);
148		- if ($result !== null) {
149		- $name = $this->getMappedName($name);
150		- $object->$name = $this->nullPlaceholderCheck($result);
151		- }
152		- }
	142	+ // Process all public properties.
	143	+ $reflect = new ReflectionObject($this);
	144	+ $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
	145	+ foreach ($props as $member) {
	146	+ $name = $member->getName();
	147	+ $result = $this->getSimpleValue($this->$name);
	148	+ if ($result !== null) {
	149	+ $name = $this->getMappedName($name);
	150	+ $object->$name = $this->nullPlaceholderCheck($result);
	151	+ }
	152	+ }
153	153
154		- return $object;
	154	+ return $object;
155	155	}
156	156
157	157	/**
		@@ -160,20 +160,20 @@ discard block
		block discarded – undo
160	160	*/
161	161	private function getSimpleValue($value)
162	162	{
163		- if ($value instanceof Google_Model) {
164		- return $value->toSimpleObject();
165		- } else if (is_array($value)) {
166		- $return = array();
167		- foreach ($value as $key => $a_value) {
168		- $a_value = $this->getSimpleValue($a_value);
169		- if ($a_value !== null) {
170		- $key = $this->getMappedName($key);
171		- $return[$key] = $this->nullPlaceholderCheck($a_value);
172		- }
173		- }
174		- return $return;
175		- }
176		- return $value;
	163	+ if ($value instanceof Google_Model) {
	164	+ return $value->toSimpleObject();
	165	+ } else if (is_array($value)) {
	166	+ $return = array();
	167	+ foreach ($value as $key => $a_value) {
	168	+ $a_value = $this->getSimpleValue($a_value);
	169	+ if ($a_value !== null) {
	170	+ $key = $this->getMappedName($key);
	171	+ $return[$key] = $this->nullPlaceholderCheck($a_value);
	172	+ }
	173	+ }
	174	+ return $return;
	175	+ }
	176	+ return $value;
177	177	}
178	178
179	179	/**
		@@ -181,10 +181,10 @@ discard block
		block discarded – undo
181	181	*/
182	182	private function nullPlaceholderCheck($value)
183	183	{
184		- if ($value === self::NULL_VALUE) {
185		- return null;
186		- }
187		- return $value;
	184	+ if ($value === self::NULL_VALUE) {
	185	+ return null;
	186	+ }
	187	+ return $value;
188	188	}
189	189
190	190	/**
		@@ -192,11 +192,11 @@ discard block
		block discarded – undo
192	192	*/
193	193	private function getMappedName($key)
194	194	{
195		- if (isset($this->internal_gapi_mappings) &&
196		- isset($this->internal_gapi_mappings[$key])) {
197		- $key = $this->internal_gapi_mappings[$key];
198		- }
199		- return $key;
	195	+ if (isset($this->internal_gapi_mappings) &&
	196	+ isset($this->internal_gapi_mappings[$key])) {
	197	+ $key = $this->internal_gapi_mappings[$key];
	198	+ }
	199	+ return $key;
200	200	}
201	201
202	202	/**
		@@ -206,16 +206,16 @@ discard block
		block discarded – undo
206	206	*/
207	207	protected function isAssociativeArray($array)
208	208	{
209		- if (!is_array($array)) {
210		- return false;
211		- }
212		- $keys = array_keys($array);
213		- foreach ($keys as $key) {
214		- if (is_string($key)) {
215		- return true;
216		- }
217		- }
218		- return false;
	209	+ if (!is_array($array)) {
	210	+ return false;
	211	+ }
	212	+ $keys = array_keys($array);
	213	+ foreach ($keys as $key) {
	214	+ if (is_string($key)) {
	215	+ return true;
	216	+ }
	217	+ }
	218	+ return false;
219	219	}
220	220
221	221	/**
		@@ -227,8 +227,8 @@ discard block
		block discarded – undo
227	227	*/
228	228	private function createObjectFromName($name, $item)
229	229	{
230		- $type = $this->$name;
231		- return new $type($item);
	230	+ $type = $this->$name;
	231	+ return new $type($item);
232	232	}
233	233
234	234	/**
		@@ -239,57 +239,57 @@ discard block
		block discarded – undo
239	239	*/
240	240	public function assertIsArray($obj, $method)
241	241	{
242		- if ($obj && !is_array($obj)) {
243		- throw new Google_Exception(
244		- "Incorrect parameter type passed to $method(). Expected an array."
245		- );
246		- }
	242	+ if ($obj && !is_array($obj)) {
	243	+ throw new Google_Exception(
	244	+ "Incorrect parameter type passed to $method(). Expected an array."
	245	+ );
	246	+ }
247	247	}
248	248
249	249	public function offsetExists($offset)
250	250	{
251		- return isset($this->$offset) \|\| isset($this->modelData[$offset]);
	251	+ return isset($this->$offset) \|\| isset($this->modelData[$offset]);
252	252	}
253	253
254	254	public function offsetGet($offset)
255	255	{
256		- return isset($this->$offset) ?
257		- $this->$offset :
258		- $this->__get($offset);
	256	+ return isset($this->$offset) ?
	257	+ $this->$offset :
	258	+ $this->__get($offset);
259	259	}
260	260
261	261	public function offsetSet($offset, $value)
262	262	{
263		- if (property_exists($this, $offset)) {
264		- $this->$offset = $value;
265		- } else {
266		- $this->modelData[$offset] = $value;
267		- $this->processed[$offset] = true;
268		- }
	263	+ if (property_exists($this, $offset)) {
	264	+ $this->$offset = $value;
	265	+ } else {
	266	+ $this->modelData[$offset] = $value;
	267	+ $this->processed[$offset] = true;
	268	+ }
269	269	}
270	270
271	271	public function offsetUnset($offset)
272	272	{
273		- unset($this->modelData[$offset]);
	273	+ unset($this->modelData[$offset]);
274	274	}
275	275
276	276	protected function keyType($key)
277	277	{
278		- return $key . "Type";
	278	+ return $key . "Type";
279	279	}
280	280
281	281	protected function dataType($key)
282	282	{
283		- return $key . "DataType";
	283	+ return $key . "DataType";
284	284	}
285	285
286	286	public function __isset($key)
287	287	{
288		- return isset($this->modelData[$key]);
	288	+ return isset($this->modelData[$key]);
289	289	}
290	290
291	291	public function __unset($key)
292	292	{
293		- unset($this->modelData[$key]);
	293	+ unset($this->modelData[$key]);
294	294	}
295	295	}

		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	{
99	99	// Hard initialise simple types, lazy load more complex ones.
100	100	foreach ($array as $key => $val) {
101		- if ( !property_exists($this, $this->keyType($key)) &&
	101	+ if (!property_exists($this, $this->keyType($key)) &&
102	102	property_exists($this, $key)) {
103	103	$this->$key = $val;
104	104	unset($array[$key]);
		@@ -254,8 +254,7 @@ discard block
		block discarded – undo
254	254	public function offsetGet($offset)
255	255	{
256	256	return isset($this->$offset) ?
257		- $this->$offset :
258		- $this->__get($offset);
	257	+ $this->$offset : $this->__get($offset);
259	258	}
260	259
261	260	public function offsetSet($offset, $value)
		@@ -275,12 +274,12 @@ discard block
		block discarded – undo
275	274
276	275	protected function keyType($key)
277	276	{
278		- return $key . "Type";
	277	+ return $key."Type";
279	278	}
280	279
281	280	protected function dataType($key)
282	281	{
283		- return $key . "DataType";
	282	+ return $key."DataType";
284	283	}
285	284
286	285	public function __isset($key)

		@@ -435,7 +435,7 @@ discard block
		block discarded – undo
435	435	* (accounts.patch)
436	436	*
437	437	* @param int $id The account id
438		- * @param Google_Account $postBody
	438	+ * @param Google_Service_AdExchangeBuyer_Account $postBody
439	439	* @param array $optParams Optional parameters.
440	440	* @return Google_Service_AdExchangeBuyer_Account
441	441	*/
		@@ -450,7 +450,7 @@ discard block
		block discarded – undo
450	450	* Updates an existing account. (accounts.update)
451	451	*
452	452	* @param int $id The account id
453		- * @param Google_Account $postBody
	453	+ * @param Google_Service_AdExchangeBuyer_Account $postBody
454	454	* @param array $optParams Optional parameters.
455	455	* @return Google_Service_AdExchangeBuyer_Account
456	456	*/
		@@ -539,7 +539,7 @@ discard block
		block discarded – undo
539	539	* updated.
540	540	* @param string $billingId The billing id associated with the budget being
541	541	* updated.
542		- * @param Google_Budget $postBody
	542	+ * @param Google_Service_AdExchangeBuyer_Budget $postBody
543	543	* @param array $optParams Optional parameters.
544	544	* @return Google_Service_AdExchangeBuyer_Budget
545	545	*/
		@@ -559,7 +559,7 @@ discard block
		block discarded – undo
559	559	* updated.
560	560	* @param string $billingId The billing id associated with the budget being
561	561	* updated.
562		- * @param Google_Budget $postBody
	562	+ * @param Google_Service_AdExchangeBuyer_Budget $postBody
563	563	* @param array $optParams Optional parameters.
564	564	* @return Google_Service_AdExchangeBuyer_Budget
565	565	*/
		@@ -601,7 +601,7 @@ discard block
		block discarded – undo
601	601	/**
602	602	* Submit a new creative. (creatives.insert)
603	603	*
604		- * @param Google_Creative $postBody
	604	+ * @param Google_Service_AdExchangeBuyer_Creative $postBody
605	605	* @param array $optParams Optional parameters.
606	606	* @return Google_Service_AdExchangeBuyer_Creative
607	607	*/
		@@ -762,7 +762,7 @@ discard block
		block discarded – undo
762	762	*
763	763	* @param string $accountId The account id to insert the pretargeting config
764	764	* for.
765		- * @param Google_PretargetingConfig $postBody
	765	+ * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
766	766	* @param array $optParams Optional parameters.
767	767	* @return Google_Service_AdExchangeBuyer_PretargetingConfig
768	768	*/
		@@ -795,7 +795,7 @@ discard block
		block discarded – undo
795	795	* @param string $accountId The account id to update the pretargeting config
796	796	* for.
797	797	* @param string $configId The specific id of the configuration to update.
798		- * @param Google_PretargetingConfig $postBody
	798	+ * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
799	799	* @param array $optParams Optional parameters.
800	800	* @return Google_Service_AdExchangeBuyer_PretargetingConfig
801	801	*/
		@@ -812,7 +812,7 @@ discard block
		block discarded – undo
812	812	* @param string $accountId The account id to update the pretargeting config
813	813	* for.
814	814	* @param string $configId The specific id of the configuration to update.
815		- * @param Google_PretargetingConfig $postBody
	815	+ * @param Google_Service_AdExchangeBuyer_PretargetingConfig $postBody
816	816	* @param array $optParams Optional parameters.
817	817	* @return Google_Service_AdExchangeBuyer_PretargetingConfig
818	818	*/

		@@ -73,11 +73,11 @@ discard block
		block discarded – undo
73	73	'required' => true,
74	74	),
75	75	),
76		- ),'list' => array(
	76	+ ), 'list' => array(
77	77	'path' => 'accounts',
78	78	'httpMethod' => 'GET',
79	79	'parameters' => array(),
80		- ),'patch' => array(
	80	+ ), 'patch' => array(
81	81	'path' => 'accounts/{id}',
82	82	'httpMethod' => 'PATCH',
83	83	'parameters' => array(
		@@ -87,7 +87,7 @@ discard block
		block discarded – undo
87	87	'required' => true,
88	88	),
89	89	),
90		- ),'update' => array(
	90	+ ), 'update' => array(
91	91	'path' => 'accounts/{id}',
92	92	'httpMethod' => 'PUT',
93	93	'parameters' => array(
		@@ -117,7 +117,7 @@ discard block
		block discarded – undo
117	117	'required' => true,
118	118	),
119	119	),
120		- ),'list' => array(
	120	+ ), 'list' => array(
121	121	'path' => 'billinginfo',
122	122	'httpMethod' => 'GET',
123	123	'parameters' => array(),
		@@ -146,7 +146,7 @@ discard block
		block discarded – undo
146	146	'required' => true,
147	147	),
148	148	),
149		- ),'patch' => array(
	149	+ ), 'patch' => array(
150	150	'path' => 'billinginfo/{accountId}/{billingId}',
151	151	'httpMethod' => 'PATCH',
152	152	'parameters' => array(
		@@ -161,7 +161,7 @@ discard block
		block discarded – undo
161	161	'required' => true,
162	162	),
163	163	),
164		- ),'update' => array(
	164	+ ), 'update' => array(
165	165	'path' => 'billinginfo/{accountId}/{billingId}',
166	166	'httpMethod' => 'PUT',
167	167	'parameters' => array(
		@@ -201,11 +201,11 @@ discard block
		block discarded – undo
201	201	'required' => true,
202	202	),
203	203	),
204		- ),'insert' => array(
	204	+ ), 'insert' => array(
205	205	'path' => 'creatives',
206	206	'httpMethod' => 'POST',
207	207	'parameters' => array(),
208		- ),'list' => array(
	208	+ ), 'list' => array(
209	209	'path' => 'creatives',
210	210	'httpMethod' => 'GET',
211	211	'parameters' => array(
		@@ -252,7 +252,7 @@ discard block
		block discarded – undo
252	252	'required' => true,
253	253	),
254	254	),
255		- ),'list' => array(
	255	+ ), 'list' => array(
256	256	'path' => 'directdeals',
257	257	'httpMethod' => 'GET',
258	258	'parameters' => array(),
		@@ -319,7 +319,7 @@ discard block
		block discarded – undo
319	319	'required' => true,
320	320	),
321	321	),
322		- ),'get' => array(
	322	+ ), 'get' => array(
323	323	'path' => 'pretargetingconfigs/{accountId}/{configId}',
324	324	'httpMethod' => 'GET',
325	325	'parameters' => array(
		@@ -334,7 +334,7 @@ discard block
		block discarded – undo
334	334	'required' => true,
335	335	),
336	336	),
337		- ),'insert' => array(
	337	+ ), 'insert' => array(
338	338	'path' => 'pretargetingconfigs/{accountId}',
339	339	'httpMethod' => 'POST',
340	340	'parameters' => array(
		@@ -344,7 +344,7 @@ discard block
		block discarded – undo
344	344	'required' => true,
345	345	),
346	346	),
347		- ),'list' => array(
	347	+ ), 'list' => array(
348	348	'path' => 'pretargetingconfigs/{accountId}',
349	349	'httpMethod' => 'GET',
350	350	'parameters' => array(
		@@ -354,7 +354,7 @@ discard block
		block discarded – undo
354	354	'required' => true,
355	355	),
356	356	),
357		- ),'patch' => array(
	357	+ ), 'patch' => array(
358	358	'path' => 'pretargetingconfigs/{accountId}/{configId}',
359	359	'httpMethod' => 'PATCH',
360	360	'parameters' => array(
		@@ -369,7 +369,7 @@ discard block
		block discarded – undo
369	369	'required' => true,
370	370	),
371	371	),
372		- ),'update' => array(
	372	+ ), 'update' => array(
373	373	'path' => 'pretargetingconfigs/{accountId}/{configId}',
374	374	'httpMethod' => 'PUT',
375	375	'parameters' => array(

		@@ -89,7 +89,7 @@
		block discarded – undo
89	89	* Insert Mail into Google's Gmail backends (mail.insert)
90	90	*
91	91	* @param string $userKey The email or immutable id of the user
92		- * @param Google_MailItem $postBody
	92	+ * @param Google_Service_Admin_MailItem $postBody
93	93	* @param array $optParams Optional parameters.
94	94	*/
95	95	public function insert($userKey, Google_Service_Admin_MailItem $postBody, $optParams = array())

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	{
33	33	/** Manage email messages of users on your domain. */
34	34	const EMAIL_MIGRATION =
35		- "https://www.googleapis.com/auth/email.migration";
	35	+ "https://www.googleapis.com/auth/email.migration";
36	36
37	37	public $mail;
38	38
		@@ -44,32 +44,32 @@ discard block
		block discarded – undo
44	44	*/
45	45	public function __construct(Google_Client $client)
46	46	{
47		- parent::__construct($client);
48		- $this->rootUrl = 'https://www.googleapis.com/';
49		- $this->servicePath = 'email/v2/users/';
50		- $this->version = 'email_migration_v2';
51		- $this->serviceName = 'admin';
	47	+ parent::__construct($client);
	48	+ $this->rootUrl = 'https://www.googleapis.com/';
	49	+ $this->servicePath = 'email/v2/users/';
	50	+ $this->version = 'email_migration_v2';
	51	+ $this->serviceName = 'admin';
52	52
53		- $this->mail = new Google_Service_Admin_Mail_Resource(
54		- $this,
55		- $this->serviceName,
56		- 'mail',
57		- array(
58		- 'methods' => array(
59		- 'insert' => array(
60		- 'path' => '{userKey}/mail',
61		- 'httpMethod' => 'POST',
62		- 'parameters' => array(
63		- 'userKey' => array(
64		- 'location' => 'path',
65		- 'type' => 'string',
66		- 'required' => true,
67		- ),
68		- ),
69		- ),
70		- )
71		- )
72		- );
	53	+ $this->mail = new Google_Service_Admin_Mail_Resource(
	54	+ $this,
	55	+ $this->serviceName,
	56	+ 'mail',
	57	+ array(
	58	+ 'methods' => array(
	59	+ 'insert' => array(
	60	+ 'path' => '{userKey}/mail',
	61	+ 'httpMethod' => 'POST',
	62	+ 'parameters' => array(
	63	+ 'userKey' => array(
	64	+ 'location' => 'path',
	65	+ 'type' => 'string',
	66	+ 'required' => true,
	67	+ ),
	68	+ ),
	69	+ ),
	70	+ )
	71	+ )
	72	+ );
73	73	}
74	74	}
75	75
		@@ -94,9 +94,9 @@ discard block
		block discarded – undo
94	94	*/
95	95	public function insert($userKey, Google_Service_Admin_MailItem $postBody, $optParams = array())
96	96	{
97		- $params = array('userKey' => $userKey, 'postBody' => $postBody);
98		- $params = array_merge($params, $optParams);
99		- return $this->call('insert', array($params));
	97	+ $params = array('userKey' => $userKey, 'postBody' => $postBody);
	98	+ $params = array_merge($params, $optParams);
	99	+ return $this->call('insert', array($params));
100	100	}
101	101	}
102	102
		@@ -121,74 +121,74 @@ discard block
		block discarded – undo
121	121
122	122	public function setIsDeleted($isDeleted)
123	123	{
124		- $this->isDeleted = $isDeleted;
	124	+ $this->isDeleted = $isDeleted;
125	125	}
126	126	public function getIsDeleted()
127	127	{
128		- return $this->isDeleted;
	128	+ return $this->isDeleted;
129	129	}
130	130	public function setIsDraft($isDraft)
131	131	{
132		- $this->isDraft = $isDraft;
	132	+ $this->isDraft = $isDraft;
133	133	}
134	134	public function getIsDraft()
135	135	{
136		- return $this->isDraft;
	136	+ return $this->isDraft;
137	137	}
138	138	public function setIsInbox($isInbox)
139	139	{
140		- $this->isInbox = $isInbox;
	140	+ $this->isInbox = $isInbox;
141	141	}
142	142	public function getIsInbox()
143	143	{
144		- return $this->isInbox;
	144	+ return $this->isInbox;
145	145	}
146	146	public function setIsSent($isSent)
147	147	{
148		- $this->isSent = $isSent;
	148	+ $this->isSent = $isSent;
149	149	}
150	150	public function getIsSent()
151	151	{
152		- return $this->isSent;
	152	+ return $this->isSent;
153	153	}
154	154	public function setIsStarred($isStarred)
155	155	{
156		- $this->isStarred = $isStarred;
	156	+ $this->isStarred = $isStarred;
157	157	}
158	158	public function getIsStarred()
159	159	{
160		- return $this->isStarred;
	160	+ return $this->isStarred;
161	161	}
162	162	public function setIsTrash($isTrash)
163	163	{
164		- $this->isTrash = $isTrash;
	164	+ $this->isTrash = $isTrash;
165	165	}
166	166	public function getIsTrash()
167	167	{
168		- return $this->isTrash;
	168	+ return $this->isTrash;
169	169	}
170	170	public function setIsUnread($isUnread)
171	171	{
172		- $this->isUnread = $isUnread;
	172	+ $this->isUnread = $isUnread;
173	173	}
174	174	public function getIsUnread()
175	175	{
176		- return $this->isUnread;
	176	+ return $this->isUnread;
177	177	}
178	178	public function setKind($kind)
179	179	{
180		- $this->kind = $kind;
	180	+ $this->kind = $kind;
181	181	}
182	182	public function getKind()
183	183	{
184		- return $this->kind;
	184	+ return $this->kind;
185	185	}
186	186	public function setLabels($labels)
187	187	{
188		- $this->labels = $labels;
	188	+ $this->labels = $labels;
189	189	}
190	190	public function getLabels()
191	191	{
192		- return $this->labels;
	192	+ return $this->labels;
193	193	}
194	194	}

GeoDirectory / geodirectory

Pull Request — master (#303)

Status

Category

Spacing +16 added lines, -16 removed lines patch added patch discarded remove patch

Braces +27 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +310 added lines, -310 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +411 added lines, -411 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

Doc Comments +18 added lines patch added patch discarded remove patch

Indentation +122 added lines, -122 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +160 added lines, -160 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Doc Comments +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +156 added lines, -156 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -15 removed lines patch added patch discarded remove patch

Doc Comments +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +111 added lines, -111 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Doc Comments +4 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +126 added lines, -126 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -5 removed lines patch added patch discarded remove patch

Doc Comments +8 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +652 added lines, -652 removed lines patch added patch discarded remove patch

Spacing +14 added lines, -14 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +47 added lines, -47 removed lines patch added patch discarded remove patch