Merge pull request #8 from magento-dragons/MAGETWO-65715-1.12.20

Upgrade zend framework to 1.12.20

Author: slavvka

.gitignore

@@ -1,3 +1,4 @@
+.vagrant
 tests/Zend/Db/Table/_files/cachefiles/*
 tests/Zend/Auth/Adapter/OpenId/_files/*
 tests/Zend/Filter/_files/Compress/*

.travis.yml

@@ -21,6 +21,7 @@ services:
   - memcached
 
 before_script:
+  - phpenv config-rm xdebug.ini || return 0
   - if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer self-update; fi
   - if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer install --no-interaction --prefer-source --dev; fi
 

CONTRIBUTING.md

@@ -1,5 +1,18 @@
 # CONTRIBUTING
 
+> ## End-of-Life occurs 28 Sep 2016
+>
+> Between now and 28 Sep 2016, we will only be accepting security patches to
+> this repository; after that date, we will issue no more releases.
+>
+> For more information:
+>
+> - https://framework.zend.com/blog/2016-06-28-zf1-eol.html
+
+---
+
+> ## Contributors License Agreement
+>
 > **To submit code, patches, and proposals to Zend Framework, contributors must
 agree to the New BSD License and also submit a signed
 [Contributor License Agreement (CLA)](https://github.com/zendframework/zf1/wiki/Contributor-License-Agreement-%28CLA%29).**
@@ -38,4 +51,4 @@ contributors a chance to resolve the vulnerability and issue a new release prior
 to any public exposure; this helps protect Zend Framework users and provides
 them with a chance to upgrade and/or update in order to protect their applications.
 
-For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
+For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).

Vagrantfile

@@ -1,90 +1,46 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-Vagrant::Config.run do |config|
-  # All Vagrant configuration is done here. The most common configuration
-  # options are documented and commented below. For a complete reference,
-  # please see the online documentation at vagrantup.com.
 
-  # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "lucid32"
+# Inline provisioning shell script
+@script = <<SCRIPT
 
-  # The url from where the 'config.vm.box' box will be fetched if it
-  # doesn't already exist on the user's system.
-  config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
+echo -e '\nexport PATH=~/.composer/vendor/bin:$PATH\n' >> ~/.bashrc
 
-  # Boot with a GUI so you can see the screen. (Default is headless)
-  #config.vm.boot_mode = :gui
+# Switch to PHP7
+newphp 7
 
-  # Assign this VM to a host-only network IP, allowing you to access it
-  # via the IP. Host-only networks can talk to the host machine as well as
-  # any other machines on the same network, but cannot be accessed (through this
-  # network interface) by any external networks.
-  # config.vm.network :hostonly, "192.168.33.10"
+# rebuild PHP7
+#makephp 7
 
-  # Assign this VM to a bridged network, allowing you to connect directly to a
-  # network using the host's network device. This makes the VM appear as another
-  # physical device on your network.
-  # config.vm.network :bridged
+echo ""
+echo "** SSH into the box to run the tests. use newphp to switch between versions and makephp 7 to rebuld PHP  7**"
+echo "** Use 'newphp nn' to switch between versions (e.g. newphp 54)**"
+echo "** Install PHPUnit via composer global require phpunit/phpunit:~n.n for the version required**"
+echo ""
+SCRIPT
 
-  # Forward a port from the guest to the host, which allows for outside
-  # computers to access the VM, whereas host only networking does not.
-  config.vm.forward_port 80, 8081
 
-  # Hostname
-  config.vm.host_name = "zf1.dev"
+# Vagrant configuration
+VAGRANTFILE_API_VERSION = "2"
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |c|
+  c.vm.define "zf1dev", primary: true do |config|
+    config.vm.box = 'rasmus/php7dev'
+    # config.vm.network :forwarded_port, guest: 80, host: 8889
+    config.vm.hostname = "zf1dev.localhost"
+    
+    config.vm.provision 'shell', inline: @script
 
-  # Pass custom arguments to VBoxManage before booting VM
-  config.vm.customize [
-    # 'modifyvm', :id, '--chipset', 'ich9', # solves kernel panic issue on some host machines
-    # '--uartmode1', 'file', 'C:\\base6-console.log' # uncomment to change log location on Windows
-    "setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"
-  ]
+    config.vm.provider "virtualbox" do |vb|
+      vb.customize ["modifyvm", :id, "--memory", "1024"]
+    end
 
-  # Share an additional folder to the guest VM. The first argument is
-  # an identifier, the second is the path on the guest to mount the
-  # folder, and the third is the path on the host to the actual folder.
-  # config.vm.share_folder "v-data", "/vagrant_data", "../data"
-
-  # Enable provisioning with Puppet stand alone.  Puppet manifests
-  # are contained in a directory path relative to this Vagrantfile.
-  # You will need to create the manifests directory and a manifest in
-  # the file lucid32.pp in the manifests_path directory.
-  #
-  # An example Puppet manifest to provision the message of the day:
-  #
-  # # group { "puppet":
-  # #   ensure => "present",
-  # # }
-  # #
-  # # File { owner => 0, group => 0, mode => 0644 }
-  # #
-  # # file { '/etc/motd':
-  # #   content => "Welcome to your Vagrant-built virtual machine!
-  # #               Managed by Puppet.\n"
-  # # }
-  #
-  # config.vm.provision :puppet do |puppet|
-  #   puppet.manifests_path = "manifests"
-  #   puppet.manifest_file  = "lucid32.pp"
-  # end
-
-
-  config.vm.provision :puppet do |puppet|
-    puppet.manifests_path = "puppet/manifests"
-    puppet.manifest_file  = "default.pp"
   end
+end
 
-#  config.vm.provision :puppet do |puppet|
-#    puppet.manifests_path = "puppet/manifests"
-#    puppet.module_path = "puppet/modules"
-#    puppet.manifest_file = "zf1.pp"
-#    puppet.options = [
-#      '--verbose',
-#      #'--debug',
-#      # '--graph',
-#      # '--graphdir=/vagrant/puppet/graphs'
-#    ]
-#  end  
 
-end
+    # config.vm.customize [
+    #   # 'modifyvm', :id, '--chipset', 'ich9', # solves kernel panic issue on some host machines
+    #   # '--uartmode1', 'file', 'C:\\base6-console.log' # uncomment to change log location on Windows
+    #   "setextradata", :id, "VBoxInternal2/SharedFoldersEnableSymlinksCreate/v-root", "1"
+    # ]

documentation/manual/de/module_specs/Zend_Form-Elements.xml

@@ -1171,7 +1171,7 @@ echo $element->renderHtmlTag("Das ist der Inhalt des HTML Tags");
                     <emphasis>required</emphasis>: Ein Flag, das anzeigt ob ein Element benötigt
                     wird wenn eine Prüfung des Formulars durchgeführt wird, oder nicht. Verwendet
                     die Zugriffsmethoden <methodname>setRequired()</methodname> und
-                    <methodname>getRequired()</methodname>. Dieses Flag ist standardmäßig
+                    <methodname>isRequired()</methodname>. Dieses Flag ist standardmäßig
                     <constant>FALSE</constant>.
                 </para>
             </listitem>
@@ -1330,7 +1330,7 @@ $element->class = 'text;
                     <listitem><para><methodname>setOrder($order)</methodname></para></listitem>
                     <listitem><para><methodname>getOrder()</methodname></para></listitem>
                     <listitem><para><methodname>setRequired($flag)</methodname></para></listitem>
-                    <listitem><para><methodname>getRequired()</methodname></para></listitem>
+                    <listitem><para><methodname>isRequired()</methodname></para></listitem>
                     <listitem><para><methodname>setAllowEmpty($flag)</methodname></para></listitem>
                     <listitem><para><methodname>getAllowEmpty()</methodname></para></listitem>
 

documentation/manual/de/module_specs/Zend_Form-StandardElements.xml

@@ -35,12 +35,6 @@
             den <link linkend="zend.form.standardDecorators.viewHelper">ViewHelper</link> und den
             <link linkend="zend.form.standardDecorators.dtDdWrapper">DtDdWrapper</link> Dekorator.
         </para>
-
-        <para>
-            Nach der Veröffentlichung oder Prüfung einer Form, kann geprüft werden ob der gegebene
-            Button geklickt wurd indem die <methodname>isChecked()</methodname> Methode verwendet
-            wird.
-        </para>
     </sect2>
 
     <sect2 id="zend.form.standardElements.captcha">

documentation/manual/de/module_specs/Zend_Gdata-Introduction.xml

@@ -59,14 +59,6 @@
                 </para>
             </listitem>
 
-            <listitem>
-                <para>
-                    <link linkend="zend.gdata.youtube">YouTube</link> bietet die Möglichkeit Videos,
-                    Kommentare, Favoriten, Einschreibungen, Benutzerprofile und vieles mehr zu
-                    Suchen und zu Empfangen.
-                </para>
-            </listitem>
-
             <listitem>
                 <para>
                     <link linkend="zend.gdata.photos">Picasa Web Album</link> bietet eine online