Merging cs-17363 back to trunk. Manual merge of conflicted files. [ZF-7581]

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17673 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Amf/AllTests.php

@@ -40,6 +40,14 @@ require_once 'Zend/Amf/AuthTest.php';
 require_once 'Zend/Amf/ResourceTest.php';
 
 
+/**
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Amf
+ */
 class Zend_Amf_AllTests
 {
     public static function main()
@@ -70,3 +78,4 @@ class Zend_Amf_AllTests
 if (PHPUnit_MAIN_METHOD == 'Zend_Amf_AllTests::main') {
     Zend_Amf_AllTests::main();
 }
+

tests/Zend/Amf/TypeLoaderTest.php

@@ -27,6 +27,14 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 require_once 'Zend/Amf/Parse/TypeLoader.php';
 
+/**
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Amf
+ */
 class Zend_Amf_TypeloaderTest extends PHPUnit_Framework_TestCase
 {
     public static function main()
@@ -84,3 +92,4 @@ class Zend_Amf_TypeloaderTest extends PHPUnit_Framework_TestCase
 if (PHPUnit_MAIN_METHOD == 'Zend_Amf_TypeloaderTest::main') {
     Zend_Amf_ResponseTest::main();
 }
+

tests/Zend/Amf/_files/services/My/ServiceA.php

@@ -1,4 +1,32 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class My_ServiceA {
     function __construct() {
         //Construction...
@@ -11,4 +39,5 @@ class My_ServiceA {
     {
         return 'Service: myMenuA';
     }
-}
+}
+

tests/Zend/Amf/_files/services/ServiceC.php

@@ -1,4 +1,32 @@
 <?php
+/**
+ * Zend Framework
+ *
+ * LICENSE
+ *
+ * This source file is subject to the new BSD license that is bundled
+ * with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://framework.zend.com/license/new-bsd
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@zend.com so we can send you a copy immediately.
+ *
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @version    $Id$
+ */
+
+/**
+ * @category   Zend
+ * @package    Zend_Amf
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ */
 class ServiceC {
     function __construct() {
         //Construction...
@@ -11,4 +39,5 @@ class ServiceC {
     {
         return 'Service: MenuC';
     }
-}
+}
+

tests/Zend/Ldap/AllTests.php

@@ -35,6 +35,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Ldap
  */
 class Zend_Ldap_AllTests
 {
@@ -47,30 +48,30 @@ class Zend_Ldap_AllTests
     {
         $suite = new PHPUnit_Framework_TestSuite('Zend Framework - Zend_Ldap');
 
-        /**
-         * @see Zend_Ldap_OfflineTest
-         */
+        /**
+         * @see Zend_Ldap_OfflineTest
+         */
         require_once 'Zend/Ldap/OfflineTest.php';
         $suite->addTestSuite('Zend_Ldap_OfflineTest');
-        /**
-         * @see Zend_Ldap_AttributeTest
-         */
-        require_once 'Zend/Ldap/AttributeTest.php';
-        $suite->addTestSuite('Zend_Ldap_AttributeTest');
-        /**
-         * @see Zend_Ldap_ConverterTest
-         */
-        require_once 'Zend/Ldap/ConverterTest.php';
-        $suite->addTestSuite('Zend_Ldap_ConverterTest');
+        /**
+         * @see Zend_Ldap_AttributeTest
+         */
+        require_once 'Zend/Ldap/AttributeTest.php';
+        $suite->addTestSuite('Zend_Ldap_AttributeTest');
+        /**
+         * @see Zend_Ldap_ConverterTest
+         */
+        require_once 'Zend/Ldap/ConverterTest.php';
+        $suite->addTestSuite('Zend_Ldap_ConverterTest');
         /**
          * @see Zend_Ldap_Dn_AllTests
          */
         require_once 'Zend/Ldap/Dn/AllTests.php';
-        $suite->addTest(Zend_Ldap_Dn_AllTests::suite());
-        /**
-         * @see Zend_Ldap_FilterTest
-         */
-        require_once 'Zend/Ldap/FilterTest.php';
+        $suite->addTest(Zend_Ldap_Dn_AllTests::suite());
+        /**
+         * @see Zend_Ldap_FilterTest
+         */
+        require_once 'Zend/Ldap/FilterTest.php';
         $suite->addTestSuite('Zend_Ldap_FilterTest');
         /**
          * @see Zend_Ldap_Node_AllTests
@@ -81,7 +82,7 @@ class Zend_Ldap_AllTests
          * @see Zend_Ldap_Ldif_AllTests
          */
         require_once 'Zend/Ldap/Ldif/AllTests.php';
-        $suite->addTest(Zend_Ldap_Ldif_AllTests::suite());
+        $suite->addTest(Zend_Ldap_Ldif_AllTests::suite());
 
         if (defined('TESTS_ZEND_LDAP_ONLINE_ENABLED')
             && constant('TESTS_ZEND_LDAP_ONLINE_ENABLED')) {
@@ -100,27 +101,26 @@ class Zend_Ldap_AllTests
              */
             require_once 'Zend/Ldap/CanonTest.php';
             $suite->addTestSuite('Zend_Ldap_CanonTest');
-            /**
-             * @see Zend_Ldap_SearchTest
-             */
-            require_once 'Zend/Ldap/SearchTest.php';
-            $suite->addTestSuite('Zend_Ldap_SearchTest');
-            /**
-             * @see Zend_Ldap_CrudTest
-             */
-            require_once 'Zend/Ldap/CrudTest.php';
-            $suite->addTestSuite('Zend_Ldap_CrudTest');
-            /**
-             * @see Zend_Ldap_CopyRenameTest
-             */
-            require_once 'Zend/Ldap/CopyRenameTest.php';
+            /**
+             * @see Zend_Ldap_SearchTest
+             */
+            require_once 'Zend/Ldap/SearchTest.php';
+            $suite->addTestSuite('Zend_Ldap_SearchTest');
+            /**
+             * @see Zend_Ldap_CrudTest
+             */
+            require_once 'Zend/Ldap/CrudTest.php';
+            $suite->addTestSuite('Zend_Ldap_CrudTest');
+            /**
+             * @see Zend_Ldap_CopyRenameTest
+             */
+            require_once 'Zend/Ldap/CopyRenameTest.php';
             $suite->addTestSuite('Zend_Ldap_CopyRenameTest');
             /**
              * @see Zend_Ldap_ChangePasswordTest
              */
             require_once 'Zend/Ldap/ChangePasswordTest.php';
-            $suite->addTestSuite('Zend_Ldap_ChangePasswordTest');
-
+            $suite->addTestSuite('Zend_Ldap_ChangePasswordTest');
         } else {
             $suite->addTest(new Zend_Ldap_SkipOnlineTests());
         }
@@ -129,6 +129,14 @@ class Zend_Ldap_AllTests
     }
 }
 
+/**
+ * @category   Zend
+ * @package    Zend_Ldap
+ * @subpackage UnitTests
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Ldap
+ */
 class Zend_Ldap_SkipOnlineTests extends PHPUnit_Framework_TestCase
 {
     public function setUp()
@@ -136,6 +144,9 @@ class Zend_Ldap_SkipOnlineTests extends PHPUnit_Framework_TestCase
         $this->markTestSkipped('Zend_Ldap online tests not enabled in TestConfiguration.php');
     }
 
+    /**
+     * @group      Zend_Ldap
+     */
     public function testNothing()
     {
     }
@@ -144,3 +155,4 @@ class Zend_Ldap_SkipOnlineTests extends PHPUnit_Framework_TestCase
 if (PHPUnit_MAIN_METHOD == 'Zend_Ldap_AllTests::main') {
     Zend_Ldap_AllTests::main();
 }
+

tests/Zend/Ldap/FilterTest.php

@@ -15,7 +15,7 @@
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @version    $Id$
  */
@@ -41,10 +41,10 @@ require_once 'Zend/Ldap/Filter/Or.php';
  * @category   Zend
  * @package    Zend_Ldap
  * @subpackage UnitTests
- * @copyright  Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
+ * @group      Zend_Ldap
  */
-
 class Zend_Ldap_FilterTest extends PHPUnit_Framework_TestCase
 {
     public function testFilterEscapeBasicOperation()
@@ -214,4 +214,5 @@ class Zend_Ldap_FilterTest extends PHPUnit_Framework_TestCase
         $this->assertEquals('(&(|(sn=Gehrig)(sn=Goerke))(|(givenName=Stefan)(givenName=Ingo)))',
             $f->toString());
     }
-}
+}
+