Merge pull request googleapis#342 from ltrebing/autoload

Use autoloading instead of include path

Author: ianbarber

README.md

@@ -25,8 +25,7 @@ For the latest installation and setup instructions, see [the documentation](http
 See the examples/ directory for examples of the key client features.
 ```PHP
 <?php
- require_once 'Google/Client.php';
- require_once 'Google/Service/Books.php';
+ require_once 'google-api-php-client/autoload.php'; // or wherever autoload.php is located
  $client = new Google_Client();
  $client->setApplicationName("Client_Library_Examples");
  $client->setDeveloperKey("YOUR_APP_KEY");

autoload.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function google_api_php_client_autoload($className) {
+ $classPath = explode('_', $className);
+ if ($classPath[0] != 'Google') {
+ return;
+ }
+ if (count($classPath) > 3) {
+ // Maximum class file path depth in this project is 3.
+ $classPath = array_slice($className, 0, 3);
+ }
+ $filePath = dirname(__FILE__) . '/src/' . implode('/', $classPath) . '.php';
+ if (file_exists($filePath)) {
+ require_once($filePath);
+ }
+}
+
+spl_autoload_register('google_api_php_client_autoload');

composer.json

@@ -16,7 +16,6 @@
  "src/"
  ]
  },
- "include-path": ["src/"],
  "extra": {
  "branch-alias": {
  "dev-master": "1.0.x-dev"

examples/appengineauth.php

@@ -21,10 +21,7 @@
  Make an API request authenticated via the 
  AppIdentity service on AppEngine.
  ************************************************/
-set_include_path("../src/" . PATH_SEPARATOR . get_include_path());
-require_once 'Google/Client.php';
-require_once 'Google/Auth/AppIdentity.php';
-require_once 'Google/Service/Storage.php';
+require_once realpath(dirname(__FILE__) . '/../autoload.php');
 
 echo pageHeader("AppIdentity Account Access");
 

examples/batch.php

@@ -22,10 +22,7 @@
  books API again as an example, but this time we
  will batch up two queries into a single call.
  ************************************************/
-set_include_path("../src/" . PATH_SEPARATOR . get_include_path());
-require_once 'Google/Client.php';
-require_once 'Google/Service/Books.php';
-require_once 'Google/Http/Batch.php';
+require_once realpath(dirname(__FILE__) . '/../autoload.php');
 
 /************************************************
  We create the client and set the simple API

examples/fileupload.php

@@ -17,10 +17,7 @@
 include_once "templates/base.php";
 session_start();
 
-set_include_path("../src/" . PATH_SEPARATOR . get_include_path());
-require_once 'Google/Client.php';
-require_once 'Google/Http/MediaFileUpload.php';
-require_once 'Google/Service/Drive.php';
+require_once realpath(dirname(__FILE__) . '/../autoload.php');
 
 /************************************************
  We'll setup an empty 20MB file to upload.

examples/idtoken.php

@@ -17,8 +17,7 @@
 include_once "templates/base.php";
 session_start();
 
-set_include_path("../src/" . PATH_SEPARATOR . get_include_path());
-require_once 'Google/Client.php';
+require_once realpath(dirname(__FILE__) . '/../autoload.php');
 
 /************************************************
  ATTENTION: Fill in these values! Make sure

examples/multi-api.php

@@ -17,10 +17,7 @@
 include_once "templates/base.php";
 session_start();
 
-set_include_path("../src/" . PATH_SEPARATOR . get_include_path());
-require_once 'Google/Client.php';
-require_once 'Google/Service/YouTube.php';
-require_once 'Google/Service/Drive.php';
+require_once realpath(dirname(__FILE__) . '/../autoload.php');
 
 /************************************************
  ATTENTION: Fill in these values! Make sure

examples/service-account.php

@@ -21,9 +21,7 @@
  Make an API request authenticated with a service
  account.
  ************************************************/
-set_include_path("../src/" . PATH_SEPARATOR . get_include_path());
-require_once 'Google/Client.php';
-require_once 'Google/Service/Books.php';
+require_once realpath(dirname(__FILE__) . '/../autoload.php');
 
 /************************************************
  ATTENTION: Fill in these values! You can get

examples/simple-query.php

@@ -25,9 +25,7 @@
  should use our quota, which is higher than the
  anonymous quota (which is limited per IP).
  ************************************************/
-set_include_path("../src/" . PATH_SEPARATOR . get_include_path());
-require_once 'Google/Client.php';
-require_once 'Google/Service/Books.php';
+require_once realpath(dirname(__FILE__) . '/../autoload.php');
 
 /************************************************
  We create the client and set the simple API