Cleanup of previous bad merge

library/Zend/Crypt/DiffieHellman.php

@@ -176,7 +176,7 @@ public function setPublicKey($number, $type = self::NUMBER)
      */
     public function getPublicKey($type = self::NUMBER)
     {
-        if ($this->_publicKey === null)) {
+        if ($this->_publicKey === null) {
             throw new DiffieHellmanException('A public key has not yet been generated using a prior call to generateKeys()');
         }
         if ($type == self::BINARY) {

library/Zend/Feed/Reader/Extension/Syndication/Feed.php

@@ -28,16 +28,6 @@
 use Zend\Date;
 
 /**
-<<<<<<< HEAD
-* @uses \Zend\Feed\Reader\Reader
-* @uses \Zend\Feed\Reader\Extension\EntryAbstract
-* @category Zend
-* @package Zend_Feed_Reader
-* @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
-* @license http://framework.zend.com/license/new-bsd New BSD License
-*/
-class Feed extends Extension\AbstractFeed
-=======
  * @uses       \Zend\Date\Date
  * @uses       \Zend\Feed\Reader\Extension\AbstractFeed
  * @category   Zend
@@ -46,7 +36,6 @@ class Feed extends Extension\AbstractFeed
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class Feed extends \Zend\Feed\Reader\Extension\AbstractFeed
->>>>>>> master
 {
     /**
      * Get update period

library/Zend/Form/Form.php

@@ -2232,7 +2232,8 @@ public function isValid($data)
         }
         $context = $data;
         foreach ($this->getElements() as $key => $element) {
-            if (null !== $translator && !$element->hasTranslator()) {
+            if (null !== $translator && $this->hasTranslator()
+                    && !$element->hasTranslator()) {
                 $element->setTranslator($translator);
             }
             $check = $data;

library/Zend/Service/Amazon/Ec2/AvailabilityZones.php

@@ -35,11 +35,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD:library/Zend/Service/Amazon/Ec2/Availabilityzones.php
-class Zend_Service_Amazon_Ec2_Availabilityzones extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class AvailabilityZones extends AbstractEc2
->>>>>>> merges/farazdagi:library/Zend/Service/Amazon/Ec2/AvailabilityZones.php
 {
     /**
      * Describes availability zones that are currently available to the account

library/Zend/Service/Amazon/Ec2/CloudWatch.php

@@ -37,11 +37,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD
-class Zend_Service_Amazon_Ec2_CloudWatch extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class CloudWatch extends AbstractEc2
->>>>>>> merges/farazdagi
 {
     /**
      * The HTTP query server

library/Zend/Service/Amazon/Ec2/Ebs.php

@@ -36,11 +36,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD
-class Zend_Service_Amazon_Ec2_Ebs extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class Ebs extends AbstractEc2
->>>>>>> merges/farazdagi
 {
     /**
      * Creates a new Amazon EBS volume that you can mount from any Amazon EC2 instance.

library/Zend/Service/Amazon/Ec2/ElasticIp.php

@@ -36,11 +36,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD:library/Zend/Service/Amazon/Ec2/Elasticip.php
-class Zend_Service_Amazon_Ec2_Elasticip extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class ElasticIp extends AbstractEc2
->>>>>>> merges/farazdagi:library/Zend/Service/Amazon/Ec2/ElasticIp.php
 {
     /**
      * Acquires an elastic IP address for use with your account

library/Zend/Service/Amazon/Ec2/Image.php

@@ -36,11 +36,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD
-class Zend_Service_Amazon_Ec2_Image extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class Image extends AbstractEc2
->>>>>>> merges/farazdagi
 {
     /**
      * Registers an AMI with Amazon EC2. Images must be registered before

library/Zend/Service/Amazon/Ec2/Instance.php

@@ -37,11 +37,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD
-class Zend_Service_Amazon_Ec2_Instance extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class Instance extends AbstractEc2
->>>>>>> merges/farazdagi
 {
     /**
      * Constant for Small Instance TYpe

library/Zend/Service/Amazon/Ec2/Keypair.php

@@ -36,11 +36,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD
-class Zend_Service_Amazon_Ec2_Keypair extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class Keypair extends AbstractEc2
->>>>>>> merges/farazdagi
 {
     /**
      * Creates a new 2048 bit RSA key pair and returns a unique ID that can

library/Zend/Service/Amazon/Ec2/Region.php

@@ -35,11 +35,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD
-class Zend_Service_Amazon_Ec2_Region extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class Region extends AbstractEc2
->>>>>>> merges/farazdagi
 {
 
     /**

library/Zend/Service/Amazon/Ec2/ReservedInstance.php

@@ -35,11 +35,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD:library/Zend/Service/Amazon/Ec2/Instance/Reserved.php
-class Zend_Service_Amazon_Ec2_Instance_Reserved extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class ReservedInstance extends AbstractEc2
->>>>>>> merges/farazdagi:library/Zend/Service/Amazon/Ec2/ReservedInstance.php
 {
     /**
      * Describes Reserved Instances that you purchased.

library/Zend/Service/Amazon/Ec2/SecurityGroups.php

@@ -35,11 +35,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD:library/Zend/Service/Amazon/Ec2/Securitygroups.php
-class Zend_Service_Amazon_Ec2_Securitygroups extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class SecurityGroups extends AbstractEc2
->>>>>>> merges/farazdagi:library/Zend/Service/Amazon/Ec2/SecurityGroups.php
 {
     /**
      * Creates a new security group.

library/Zend/Service/Amazon/Ec2/WindowsInstance.php

@@ -39,11 +39,7 @@
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-<<<<<<< HEAD:library/Zend/Service/Amazon/Ec2/Instance/Windows.php
-class Zend_Service_Amazon_Ec2_Instance_Windows extends Zend_Service_Amazon_Ec2_AbstractService
-=======
 class WindowsInstance extends AbstractEc2
->>>>>>> merges/farazdagi:library/Zend/Service/Amazon/Ec2/WindowsInstance.php
 {
     /**
      * Bundles an Amazon EC2 instance running Windows

library/Zend/Service/Amazon/Item.php

@@ -129,23 +129,9 @@ class Item
      * 
      * @group ZF-9547
      */
-<<<<<<< HEAD
-    public function __construct($dom)
-    {
-    	if (null === $dom) {
-    		require_once 'Zend/Service/Amazon/Exception.php';
-    		throw new Zend_Service_Amazon_Exception('Item element is empty');
-    	}
-    	if (!$dom instanceof DOMElement) {
-    		require_once 'Zend/Service/Amazon/Exception.php';
-    		throw new Zend_Service_Amazon_Exception('Item is not a valid DOM element');
-    	}
-        $xpath = new DOMXPath($dom->ownerDocument);
-=======
     public function __construct(\DOMElement $dom)
     {
         $xpath = new \DOMXPath($dom->ownerDocument);
->>>>>>> merges/farazdagi
         $xpath->registerNamespace('az', 'http://webservices.amazon.com/AWSECommerceService/2005-10-05');
         $this->ASIN = $xpath->query('./az:ASIN/text()', $dom)->item(0)->data;
 

library/Zend/Service/Amazon/Sqs/Sqs.php

@@ -40,11 +40,7 @@
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  * @see        http://aws.amazon.com/sqs/ Amazon Simple Queue Service
  */
-<<<<<<< HEAD:library/Zend/Service/Amazon/Sqs.php
-class Zend_Service_Amazon_Sqs extends Zend_Service_Amazon_AbstractService
-=======
 class Sqs extends \Zend\Service\Amazon\AbstractAmazon
->>>>>>> merges/farazdagi:library/Zend/Service/Amazon/Sqs/Sqs.php
 {
     /**
      * Default timeout for createQueue() function

library/Zend/Session/Configuration/StandardConfiguration.php

@@ -26,7 +26,7 @@
 
 use Zend\Session\Configuration as Configurable,
     Zend\Session\Exception as SessionException,
-    Zend\Validator\Hostname\Hostname as HostnameValidator,
+    Zend\Validator\Hostname as HostnameValidator,
     Zend\Filter\Word\CamelCaseToUnderscore as CamelCaseToUnderscoreFilter;
 
 /**

library/Zend/Tool/Project/Context/Zf/ControllerFile.php

@@ -117,7 +117,7 @@ public function getContents()
             'classes' => array(
                 new Php\PhpClass(array(
                     'name' => $className,
-                    'extendedClass' => 'Zend\Controller\Action',
+                    'extendedClass' => '\Zend\Controller\Action',
                     'methods' => array(
                         new Php\PhpMethod(array(
                             'name' => 'init',

tests/Bootstrap.php

@@ -49,59 +49,7 @@
 /**
  * Setup autoloading
  */
-function ZendTest_Autoloader($class) 
-{
-    $class = ltrim($class, '\\');
-
-    if (!preg_match('#^(Zend(Test)?|PHPUnit)(\\\\|_)#', $class)) {
-        return false;
-    }
-
-    // $segments = explode('\\', $class); // preg_split('#\\\\|_#', $class);//
-    $segments = preg_split('#[\\\\_]#', $class); // preg_split('#\\\\|_#', $class);//
-    $ns       = array_shift($segments);
-
-    switch ($ns) {
-        case 'Zend':
-            $file = dirname(__DIR__) . '/library/Zend/';
-            break;
-        case 'ZendTest':
-            // temporary fix for ZendTest namespace until we can migrate files 
-            // into ZendTest dir
-            $file = __DIR__ . '/Zend/';
-            break;
-        default:
-            $file = false;
-            break;
-    }
-
-    if ($file) {
-        $file .= implode('/', $segments) . '.php';
-        if (file_exists($file)) {
-            return include_once $file;
-        }
-    }
-
-    $segments = explode('_', $class);
-    $ns       = array_shift($segments);
-
-    switch ($ns) {
-        case 'PHPUnit':
-            return include_once str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
-        case 'Zend':
-            $file = dirname(__DIR__) . '/library/Zend/';
-            break;
-        default:
-            return false;
-    }
-    $file .= implode('/', $segments) . '.php';
-    if (file_exists($file)) {
-        return include_once $file;
-    }
-
-    return false;
-}
-spl_autoload_register('ZendTest_Autoloader', true, true);
+include __DIR__ . '/_autoload.php';
 
 /*
  * Load the user-defined test configuration file, if it exists; otherwise, load

tests/Zend/Form/FormTest.php

@@ -4064,7 +4064,39 @@ public function testGetValidSubFormValues()
 
         $this->assertEquals(array('sub' => array('valid' => 1234)), $this->form->getValidValues($data));
     }
-
+
+     /**
+     * @group ZF-9275
+     */
+    public function testElementTranslatorNotOverriddenbyGlobalTranslatorDuringValidation()
+    {
+        $translator = new Translator('ArrayAdapter', array('foo' => 'bar'));
+        Registry::set('Zend_Translate', $translator);
+
+        $this->form->addElement('text', 'foo');
+        $this->form->isValid(array());
+
+        $received = $this->form->foo->hasTranslator();
+        $this->assertSame(false, $received);
+    }
+
+    /**
+     * @group ZF-9275
+     */
+    public function testZendValidateDefaultTranslatorOverridesZendTranslateDefaultTranslatorAtElementLevel()
+    {
+        $translate = new Translator('ArrayAdapter', array('isEmpty' => 'translate'));
+        Registry::set('Zend_Translate', $translate);
+
+        $translateValidate = new Translator('ArrayAdapter', array('isEmpty' => 'validate'));
+        \Zend\Validator\AbstractValidator::setDefaultTranslator($translateValidate);
+
+        $this->form->addElement('text', 'foo', array('required'=>1));
+        $this->form->isValid(array());
+
+        $this->assertSame(array('isEmpty' => 'validate'), $this->form->foo->getMessages());
+    }
+
     /**
      * @group ZF-9494
      */

tests/Zend/Session/ContainerTest.php

@@ -10,6 +10,7 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
+        $this->forceAutoloader();
         $_SESSION = array();
         Container::setDefaultManager(null);
         $this->manager = $manager = new TestAsset\TestManager(array(
@@ -25,6 +26,27 @@ public function tearDown()
         Container::setDefaultManager(null);
     }
 
+    protected function forceAutoloader()
+    {
+        $splAutoloadFunctions = spl_autoload_functions();
+        if (!$splAutoloadFunctions || !in_array('ZendTest_Autoloader', $splAutoloadFunctions)) {
+            include __DIR__ . '/../../_autoload.php';
+        }
+    }
+
+    /**
+     * Hack to allow running tests in separate processes
+     *
+     * @see    http://matthewturland.com/2010/08/19/process-isolation-in-phpunit/
+     * @param  PHPUnit_Framework_TestResult $result 
+     * @return void
+     */
+    public function run(\PHPUnit_Framework_TestResult $result = NULL)
+    {
+        $this->setPreserveGlobalState(false);
+        return parent::run($result);
+    }
+
     public function testInstantiationStartsSession()
     {
         $this->manager->destroy();