Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

Conflicts:
	tests/WindowsAzureTests.php
  • Loading branch information...
commit 015f0fd8c99cb9bf66e29865edd6aeaecd8258e4 2 parents 5564d1a + a2f5e96
Abdelrahman Elogeel authored
1  Defaults.php
... ...
@@ -1,4 +1,5 @@
1 1
 <?php
  2
+
2 3
 /**
3 4
  * LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
4 5
  * you may not use this file except in compliance with the License.
2  WindowsAzure/Blob/BlobRestProxy.php
... ...
@@ -1,7 +1,7 @@
1 1
 <?php
2 2
 
3 3
 /**
4  
- * LICENSE: Licensed under the Apache License, Version 2.0 (the "License")
  4
+ * LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
5 5
  * you may not use this file except in compliance with the License.
6 6
  * You may obtain a copy of the License at
7 7
  * http://www.apache.org/licenses/LICENSE-2.0
23  WindowsAzure/WindowsAzure.php
... ...
@@ -1,4 +1,27 @@
1 1
 <?php
  2
+
  3
+/**
  4
+ * LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
  5
+ * you may not use this file except in compliance with the License.
  6
+ * You may obtain a copy of the License at
  7
+ * http://www.apache.org/licenses/LICENSE-2.0
  8
+ *
  9
+ * Unless required by applicable law or agreed to in writing, software
  10
+ * distributed under the License is distributed on an "AS IS" BASIS,
  11
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12
+ * See the License for the specific language governing permissions and
  13
+ * limitations under the License.
  14
+ *
  15
+ * PHP version 5
  16
+ *
  17
+ * @category  Microsoft
  18
+ * @package   WindowsAzure
  19
+ * @author    Azure PHP SDK <azurephpsdk@microsoft.com>
  20
+ * @copyright 2012 Microsoft Corporation
  21
+ * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  22
+ * @link      https://github.com/windowsazure/azure-sdk-for-php
  23
+ */
  24
+
2 25
 spl_autoload_register(
3 26
    function($class) {
4 27
       static $classes = null;
23  build/src_autoload.php.in
... ...
@@ -1,4 +1,27 @@
1 1
 <?php
  2
+
  3
+/**
  4
+ * LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
  5
+ * you may not use this file except in compliance with the License.
  6
+ * You may obtain a copy of the License at
  7
+ * http://www.apache.org/licenses/LICENSE-2.0
  8
+ *
  9
+ * Unless required by applicable law or agreed to in writing, software
  10
+ * distributed under the License is distributed on an "AS IS" BASIS,
  11
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12
+ * See the License for the specific language governing permissions and
  13
+ * limitations under the License.
  14
+ *
  15
+ * PHP version 5
  16
+ *
  17
+ * @category  Microsoft
  18
+ * @package   WindowsAzure
  19
+ * @author    Azure PHP SDK <azurephpsdk@microsoft.com>
  20
+ * @copyright 2012 Microsoft Corporation
  21
+ * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  22
+ * @link      https://github.com/windowsazure/azure-sdk-for-php
  23
+ */
  24
+
2 25
 spl_autoload_register(
3 26
    function($class) {
4 27
       static $classes = null;
23  build/tests_autoload.php.in
... ...
@@ -1,4 +1,27 @@
1 1
 <?php
  2
+
  3
+/**
  4
+ * LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
  5
+ * you may not use this file except in compliance with the License.
  6
+ * You may obtain a copy of the License at
  7
+ * http://www.apache.org/licenses/LICENSE-2.0
  8
+ *
  9
+ * Unless required by applicable law or agreed to in writing, software
  10
+ * distributed under the License is distributed on an "AS IS" BASIS,
  11
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  12
+ * See the License for the specific language governing permissions and
  13
+ * limitations under the License.
  14
+ *
  15
+ * PHP version 5
  16
+ *
  17
+ * @category  Microsoft
  18
+ * @package   WindowsAzure
  19
+ * @author    Azure PHP SDK <azurephpsdk@microsoft.com>
  20
+ * @copyright 2012 Microsoft Corporation
  21
+ * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  22
+ * @link      https://github.com/windowsazure/azure-sdk-for-php
  23
+ */
  24
+
2 25
 require dirname(__DIR__) . '/WindowsAzure/WindowsAzure.php';
3 26
 
4 27
 spl_autoload_register(
2  package.php
... ...
@@ -1,4 +1,5 @@
1 1
 <?php
  2
+
2 3
 /**
3 4
  * LICENSE: Licensed under the Apache License, Version 2.0 (the "License");
4 5
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@
20 21
  * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
21 22
  * @link      https://github.com/windowsazure/azure-sdk-for-php
22 23
  */
  24
+
23 25
 require_once 'PEAR/PackageFileManager2.php';
24 26
 require_once 'Defaults.php';
25 27
 PEAR::setErrorHandling(PEAR_ERROR_DIE);
12  tests/framework/FiddlerFilter.php
@@ -14,12 +14,12 @@
14 14
  * 
15 15
  * PHP version 5
16 16
  *
17  
- * @category   Microsoft
18  
- * @package    Tests\Framework
19  
- * @author     Azure PHP SDK <azurephpsdk@microsoft.com>
20  
- * @copyright  2012 Microsoft Corporation
21  
- * @license    http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
22  
- * @link       https://github.com/windowsazure/azure-sdk-for-php
  17
+ * @category  Microsoft
  18
+ * @package   Tests\Framework
  19
+ * @author    Azure PHP SDK <azurephpsdk@microsoft.com>
  20
+ * @copyright 2012 Microsoft Corporation
  21
+ * @license   http://www.apache.org/licenses/LICENSE-2.0  Apache License 2.0
  22
+ * @link      https://github.com/windowsazure/azure-sdk-for-php
23 23
  */
24 24
  
25 25
 namespace Tests\Framework;
2  tests/unit/WindowsAzure/Common/Internal/LoggerTest.php
@@ -22,7 +22,7 @@
22 22
  * @link      https://github.com/windowsazure/azure-sdk-for-php
23 23
  */
24 24
 
25  
-namespace Tests\Unit\WindowsAzure;
  25
+namespace Tests\Unit\WindowsAzure\Common\Internal;
26 26
 use WindowsAzure\Common\Internal\Logger;
27 27
 use WindowsAzure\Common\Internal\Resources;
28 28
 use Tests\Framework\VirtualFileSystem;
2  tests/unit/WindowsAzure/Common/Internal/UtilitiesTest.php
@@ -22,7 +22,7 @@
22 22
  * @link      https://github.com/windowsazure/azure-sdk-for-php
23 23
  */
24 24
 
25  
-namespace Tests\Unit\WindowsAzure;
  25
+namespace Tests\Unit\WindowsAzure\Common\Internal;
26 26
 use WindowsAzure\Common\Internal\Utilities;
27 27
 use WindowsAzure\Common\Internal\Resources;
28 28
 use Tests\Framework\TestResources;
2  tests/unit/WindowsAzure/Common/Internal/ValidateTest.php
@@ -22,7 +22,7 @@
22 22
  * @link      https://github.com/windowsazure/azure-sdk-for-php
23 23
  */
24 24
 
25  
-namespace Tests\Unit\WindowsAzure;
  25
+namespace Tests\Unit\WindowsAzure\Common\Internal;
26 26
 use WindowsAzure\Common\Internal\Validate;
27 27
 use WindowsAzure\Common\Internal\InvalidArgumentTypeException;
28 28
 use WindowsAzure\Common\Internal\Resources;
2  tests/unit/WindowsAzure/Queue/QueueRestProxyTest.php
@@ -22,7 +22,7 @@
22 22
  * @link      https://github.com/windowsazure/azure-sdk-for-php
23 23
  */
24 24
 
25  
-namespace Tests\Unit\WindowsAzure\Queue\Internal;
  25
+namespace Tests\Unit\WindowsAzure\Queue;
26 26
 use WindowsAzure\Common\Internal\Utilities;
27 27
 use Tests\Framework\QueueServiceRestProxyTestBase;
28 28
 use WindowsAzure\Common\Configuration;

0 notes on commit 015f0fd

Please sign in to comment.
Something went wrong with that request. Please try again.