From 5d84d79dd1a46d31bd68ce89694e2d674046bccf Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Tue, 27 Mar 2012 13:18:47 -0600 Subject: [PATCH 1/6] Added autoloader to composer.json. --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 73202cf..5b3c8f2 100644 --- a/composer.json +++ b/composer.json @@ -16,5 +16,8 @@ }, "suggest": { "curl": ">=7.0.0" + }, + "autoload": { + "psr-0": { "HPCloud": "src" } } } From a7a6290368ca74b7c0ee5658ef2d6392fcd22e07 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 9 Apr 2012 16:14:26 -0500 Subject: [PATCH 2/6] DEVEX-2373: Fixed a spelling error in streams tutorial. --- doc/streams-tutorial.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/streams-tutorial.md b/doc/streams-tutorial.md index 1c22cc9..b7a548d 100644 --- a/doc/streams-tutorial.md +++ b/doc/streams-tutorial.md @@ -153,7 +153,7 @@ The URL above has three important parts, in the form `swift://CONTAINER/OBJECT_NAME`. - *swift://*: This is the schema. This part of the URL tells PHP to pass - the request to the HPCloud stream wrapper. (Siwft, by the way, is the + the request to the HPCloud stream wrapper. (Swift, by the way, is the [OpenStack name for object storage](http://openstack.org/projects/storage/). - *Example*: This is the *container name*. In Object Storage parlance, a container is a place to store documents. One account can have lots of From 0926f86179d7098e4f1a1167e05808ec9fbb46fd Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 9 Apr 2012 16:17:12 -0500 Subject: [PATCH 3/6] DEVEX-2372: Fixed spelling errors. --- doc/oo-tutorial.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/oo-tutorial.md b/doc/oo-tutorial.md index bb7ca99..f097089 100644 --- a/doc/oo-tutorial.md +++ b/doc/oo-tutorial.md @@ -164,7 +164,7 @@ network resources. And behind the scenes, account management would be difficult on the server side. That's where Identity Services comes in. It is a central service that -handles all things authorization and authentication related. Rouughly, +handles all things authorization and authentication related. Roughly, it works as follows: - The client sends an authentication request @@ -319,7 +319,7 @@ $container = $store->container('Example'); ~~~ Recall that `$store` is the name of our `ObjectStorage` instance. In the -first of the two lines above, we create a new containe named `Example`. +first of the two lines above, we create a new container named `Example`. Then in the second line, we get that container. Why is this two steps? The answer is that the HPCloud PHP library mimics @@ -372,7 +372,7 @@ with a local copy and a remote copy. If our code isn't constructed correctly, it is possible for these two to get out of sync. Earlier, we created a container directly on the remote side, and then -featched the container. As we create an object, we are going to do the +fetched the container. As we create an object, we are going to do the opposite: We will create a local object, and then save it to the remote storage. Later, we will fetch the remote object. From 83145d8ba4e11ca45eeba8e8810edd1ae7733dbf Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 9 Apr 2012 16:19:20 -0500 Subject: [PATCH 4/6] DEVEX-2371: Fixed spelling errors in documentation.php. --- doc/documentation.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/documentation.php b/doc/documentation.php index ee8d442..fe95577 100644 --- a/doc/documentation.php +++ b/doc/documentation.php @@ -131,7 +131,7 @@ * // management console. * $identity = new IdentityServices('http://get.url.from.hpcloud.com'); * - * // You can authenticate either with username/password (IdentityServices::authenticateAsUser()) + * // You can authenticate either with username/password (IdentityServices::authenticateAsAccount()) * // or as an account/secret key (IdentityServices::authenticateAsAccount()). In either * // case you can get the info you need from the management console. * $account = '123456789098765'; @@ -144,7 +144,7 @@ * * // Get a listing of all of the services you currently have configured on * // HPCloud. - * $catalog = $itentity->serviceCatalog(); + * $catalog = $identity->serviceCatalog(); * * var_dump($catalog); * @@ -158,9 +158,9 @@ * access to your account. HPCloud::Services::IdentityServices explains the details, but here are * a few functions you'll want to know: * - HPCloud::Services::IdentityServices::__construct() tells the object where to connect. - * - HPCloud::Services::IdentityServices::authenticateAsUser() lets you log + * - HPCloud::Services::IdentityServices::authenticateAsAccount() lets you log * in with username and password. - * - HPCloud::Services::IdentityServices::authenticateAsUser() lets you log + * - HPCloud::Services::IdentityServices::authenticateAsAccount() lets you log * in with account number and secret key. * - HPCloud::Services::IdentityServices::serviceCatalog() tells you about * the services you have activated on this account. From b074da9d0df675a96e5534a3f3082977ec2e4db2 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 9 Apr 2012 16:21:25 -0500 Subject: [PATCH 5/6] DEVEX-2356: Fixing typos in oo-tutorial. --- doc/oo-tutorial.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/oo-tutorial.md b/doc/oo-tutorial.md index f097089..e32840b 100644 --- a/doc/oo-tutorial.md +++ b/doc/oo-tutorial.md @@ -65,7 +65,7 @@ look at [the PHP documentation](http://us3.php.net/manual/en/language.namespaces or you may just prefer to keep on reading and learn by example. We don't do anything really fancy with namespaces. -**In this document, we sometimes replace the backslash (\) with double +**In this document, we sometimes replace the backslash (\\) with double colons (`::`) so that links are automatically generated.** So `\HPCloud\Bootstrap` may appear as HPCloud::Bootstrap. The reason for this is [explained elsewhere](@ref styleguide). @@ -227,7 +227,7 @@ dumping it with `var_dump()`, should you so desire. At this point, we have what we need from Identity Services. It's time to look at Object Storage. -### IdentityServices in a Nushell +### IdentityServices in a Nutshell Instances of HPCloud::Services::IdentityServices are responsible for: From be5253358c0f0126b8d0929edf80554076d3fa72 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Tue, 10 Apr 2012 14:20:53 -0500 Subject: [PATCH 6/6] Accidentally changed too many doc values last time. --- doc/documentation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/documentation.php b/doc/documentation.php index fe95577..af39444 100644 --- a/doc/documentation.php +++ b/doc/documentation.php @@ -131,7 +131,7 @@ * // management console. * $identity = new IdentityServices('http://get.url.from.hpcloud.com'); * - * // You can authenticate either with username/password (IdentityServices::authenticateAsAccount()) + * // You can authenticate either with username/password (IdentityServices::authenticateAsUser()) * // or as an account/secret key (IdentityServices::authenticateAsAccount()). In either * // case you can get the info you need from the management console. * $account = '123456789098765'; @@ -158,7 +158,7 @@ * access to your account. HPCloud::Services::IdentityServices explains the details, but here are * a few functions you'll want to know: * - HPCloud::Services::IdentityServices::__construct() tells the object where to connect. - * - HPCloud::Services::IdentityServices::authenticateAsAccount() lets you log + * - HPCloud::Services::IdentityServices::authenticateAsUser() lets you log * in with username and password. * - HPCloud::Services::IdentityServices::authenticateAsAccount() lets you log * in with account number and secret key.