Permalink
Browse files

Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php

Conflicts:
	tests/WindowsAzureTests.php
  • Loading branch information...
2 parents 5564d1a + a2f5e96 commit 015f0fd8c99cb9bf66e29865edd6aeaecd8258e4 Abdelrahman Elogeel committed Jun 5, 2012
View
@@ -1,4 +1,5 @@
<?php
+
/**
* LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -1,7 +1,7 @@
<?php
/**
- * LICENSE: Licensed under the Apache License, Version 2.0 (the "License")
+ * LICENSE: 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
@@ -1,4 +1,27 @@
<?php
+
+/**
+ * LICENSE: 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.
+ *
+ * PHP version 5
+ *
+ * @category Microsoft
+ * @package WindowsAzure
+ * @author Azure PHP SDK <azurephpsdk@microsoft.com>
+ * @copyright 2012 Microsoft Corporation
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
+ * @link https://github.com/windowsazure/azure-sdk-for-php
+ */
+
spl_autoload_register(
function($class) {
static $classes = null;
@@ -1,4 +1,27 @@
<?php
+
+/**
+ * LICENSE: 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.
+ *
+ * PHP version 5
+ *
+ * @category Microsoft
+ * @package WindowsAzure
+ * @author Azure PHP SDK <azurephpsdk@microsoft.com>
+ * @copyright 2012 Microsoft Corporation
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
+ * @link https://github.com/windowsazure/azure-sdk-for-php
+ */
+
spl_autoload_register(
function($class) {
static $classes = null;
@@ -1,4 +1,27 @@
<?php
+
+/**
+ * LICENSE: 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.
+ *
+ * PHP version 5
+ *
+ * @category Microsoft
+ * @package WindowsAzure
+ * @author Azure PHP SDK <azurephpsdk@microsoft.com>
+ * @copyright 2012 Microsoft Corporation
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
+ * @link https://github.com/windowsazure/azure-sdk-for-php
+ */
+
require dirname(__DIR__) . '/WindowsAzure/WindowsAzure.php';
spl_autoload_register(
View
@@ -1,4 +1,5 @@
<?php
+
/**
* LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
* @link https://github.com/windowsazure/azure-sdk-for-php
*/
+
require_once 'PEAR/PackageFileManager2.php';
require_once 'Defaults.php';
PEAR::setErrorHandling(PEAR_ERROR_DIE);
@@ -14,12 +14,12 @@
*
* PHP version 5
*
- * @category Microsoft
- * @package Tests\Framework
- * @author Azure PHP SDK <azurephpsdk@microsoft.com>
- * @copyright 2012 Microsoft Corporation
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
- * @link https://github.com/windowsazure/azure-sdk-for-php
+ * @category Microsoft
+ * @package Tests\Framework
+ * @author Azure PHP SDK <azurephpsdk@microsoft.com>
+ * @copyright 2012 Microsoft Corporation
+ * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License 2.0
+ * @link https://github.com/windowsazure/azure-sdk-for-php
*/
namespace Tests\Framework;
@@ -22,7 +22,7 @@
* @link https://github.com/windowsazure/azure-sdk-for-php
*/
-namespace Tests\Unit\WindowsAzure;
+namespace Tests\Unit\WindowsAzure\Common\Internal;
use WindowsAzure\Common\Internal\Logger;
use WindowsAzure\Common\Internal\Resources;
use Tests\Framework\VirtualFileSystem;
@@ -22,7 +22,7 @@
* @link https://github.com/windowsazure/azure-sdk-for-php
*/
-namespace Tests\Unit\WindowsAzure;
+namespace Tests\Unit\WindowsAzure\Common\Internal;
use WindowsAzure\Common\Internal\Utilities;
use WindowsAzure\Common\Internal\Resources;
use Tests\Framework\TestResources;
@@ -22,7 +22,7 @@
* @link https://github.com/windowsazure/azure-sdk-for-php
*/
-namespace Tests\Unit\WindowsAzure;
+namespace Tests\Unit\WindowsAzure\Common\Internal;
use WindowsAzure\Common\Internal\Validate;
use WindowsAzure\Common\Internal\InvalidArgumentTypeException;
use WindowsAzure\Common\Internal\Resources;
@@ -22,7 +22,7 @@
* @link https://github.com/windowsazure/azure-sdk-for-php
*/
-namespace Tests\Unit\WindowsAzure\Queue\Internal;
+namespace Tests\Unit\WindowsAzure\Queue;
use WindowsAzure\Common\Internal\Utilities;
use Tests\Framework\QueueServiceRestProxyTestBase;
use WindowsAzure\Common\Configuration;

0 comments on commit 015f0fd

Please sign in to comment.