Skip to content

Commit

Permalink
upgrade to Zend 1.12.20
Browse files Browse the repository at this point in the history
  • Loading branch information
bretdavidson committed Mar 7, 2018
1 parent 91b75e8 commit 297b6c1
Show file tree
Hide file tree
Showing 4,715 changed files with 43,931 additions and 72,352 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions service/lib/zend/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/demos export-ignore
/tests export-ignore
/documentation export-ignore
1 change: 1 addition & 0 deletions service/lib/zend/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.vagrant
tests/Zend/Db/Table/_files/cachefiles/*
tests/Zend/Auth/Adapter/OpenId/_files/*
tests/Zend/Filter/_files/Compress/*
Expand Down
17 changes: 14 additions & 3 deletions service/lib/zend/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,37 @@
language: php

sudo: false

php:
- 5.2
- 5.3
- 5.4
- 5.5
- 5.6
- 7
- hhvm

env: TMPDIR=/tmp

install:
- sh ./tests/install_dependencies.sh
- if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then sh ./tests/php52_install_dependencies.sh; fi
- phpenv rehash

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

- mysql -e 'create database zftest;'
- psql -c 'create database zftest;' -U postgres
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini

- if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]] && [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]] && [[ "$TRAVIS_PHP_VERSION" != "7" ]]; then phpenv config-add tests/config.ini; fi
- if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then phpenv config-add tests/php52_config.ini; fi
- if [[ "$TRAVIS_PHP_VERSION" == "7" ]]; then phpenv config-add tests/php7_config.ini; fi

- cp ./tests/TestConfiguration.travis.php ./tests/TestConfiguration.php

script:
Expand All @@ -30,4 +40,5 @@ script:

matrix:
allow_failures:
- php: 7
- php: hhvm
15 changes: 14 additions & 1 deletion service/lib/zend/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -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).**
Expand Down Expand Up @@ -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).
78 changes: 43 additions & 35 deletions service/lib/zend/DEVELOPMENT_README.md
Original file line number Diff line number Diff line change
@@ -1,55 +1,63 @@
Development using a virtual machine
###################################
# Development using a virtual machine

You can set up a development virtual machine for ZF1 unit testing and library
development following these simple instructions.

1. Install requirements for VM. (Note: these are not required by ZF1 itself)
- VirtualBox (https://www.virtualbox.org/)
- Ruby (http://www.ruby-lang.org/)
- Vagrant (http://vagrantup.com/)
### 1. Install requirements for VM. (Note: these are not required by ZF1 itself)

2. Checkout repository to any location
> git clone git://github.com:zendframework/zf1.git zf1-dev
> cd zf1-dev
3. Start the process by running Vagrant.
> vagrant up
- VirtualBox (https://www.virtualbox.org/)
- Ruby (http://www.ruby-lang.org/)
- Vagrant (http://vagrantup.com/)

### 2. Checkout repository to any location

git clone git://github.com/zendframework/zf1.git zf1-dev
cd zf1-dev

### 3. Start the process by running Vagrant.

vagrant up

This will take a long while as it has to download a VM image and then
provision it. Once it has finished, it will exit and leave you back at the
command prompt.

This will take a long while as it has to download a VM image and then
provision it. Once it has finished, it will exit and leave you back at the
command prompt.
### 4. SSH into the VM

4. SSH into the VM
> vagrant ssh
vagrant ssh

5. Build a version of PHP.
> php-build.sh 5.3.11
### 5. Build a version of PHP.

This also takes a while as it compiles PHP for you!
php-build.sh 5.3.11

This also takes a while as it compiles PHP for you!

6. Select PHP to use:
> pe 5.3.11
### 6. Select PHP to use:

pe 5.3.11

### 7. Run tests

7. Run tests
> cd /vagrant/tests
> phpunit --stderr -d memory_limit=-1 Zend/Acl/AclTest.php
> phpunit --stderr -d memory_limit=-1 Zend/Amf/AllTests.php
(etc...)
cd /vagrant/tests
phpunit --stderr -d memory_limit=-1 Zend/Acl/AclTest.php
phpunit --stderr -d memory_limit=-1 Zend/Amf/AllTests.php
(etc...)

Note that you can repeat items 5 and 6 to create any version if PHP.

Notes:
## Notes:

- The VM will be running in the background as VBoxHeadless
- HTTP and SSH ports on the VM are forwarded to localhost (22 -> 2222, 80 -> 8081)
- The zf1-dev directory you checked out will be mounted inside the VM at /vagrant
- You can develop by editing the files you cloned in the IDE of you choice.
- To stop the VM do one of the following:
> vagrant suspend # if you plan on running it later
> vagrant halt # if you wish to turn off the VM, but keep it around
> vagrant destroy # if you wish to delete the VM completely
- Also, when any of of the Puppet manifests change (.pp files), it is a good idea to rerun them:
> vagrant provision

To stop the VM do one of the following:

vagrant suspend # if you plan on running it later
vagrant halt # if you wish to turn off the VM, but keep it around
vagrant destroy # if you wish to delete the VM completely

Also, when any of of the Puppet manifests change (.pp files), it is a good idea to rerun them:

vagrant provision
2 changes: 1 addition & 1 deletion service/lib/zend/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2005-2014, Zend Technologies USA, Inc.
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
Expand Down
38 changes: 22 additions & 16 deletions service/lib/zend/README.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
![Logo](http://framework.zend.com/images/logos/ZendFramework-logo.png)

> ## 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
---

Welcome to the Zend Framework 1.12 Release!

Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch=master)](https://travis-ci.org/zendframework/zf1)

RELEASE INFORMATION
===================

Zend Framework 1.12.9Release.
Released on September 17, 2014.
Zend Framework 1.12.20 Release.
Released on September 08, 2016.

IMPORTANT FIXES FOR 1.12.9
--------------------------
IMPORTANT FIXES FOR 1.12.20
---------------------------

**This release contains security updates:**

- **ZF2014-05:** Due to an issue that existed in PHP's LDAP extension, it is
possible to perform an unauthenticated simple bind against a LDAP server by
using a null byte for the password, regardless of whether or not the user
normally requires a password. We have provided a patch in order to protect
users of unpatched PHP versions (PHP 5.5 <= 5.5.11, PHP 5.4 <= 5.4.27, all
versions of PHP 5.3 and below). If you use `Zend_Ldap` and are on an affected
version of PHP, we recommend upgrading immediately.
- **ZF2014-06** `Zend_Db_Adapter_Sqlsrv` had a potential SQL injection
vulnerability via improperly quoted null bytes. The code has been updated to
ensure proper quoting and thus remove the security vector. If you are using
`Zend_Db_Adapter_Sqlsrv` and manually quoting values via the adapter, we
encourage you to upgrade immediately.
- **ZF2016-03:** The implementation of `ORDER BY` and `GROUP BY` in
`Zend_Db_Select` remained prone to SQL injection when a combination of SQL
expressions and comments were used. This release provides a comprehensive
solution that identifies and removes comments prior to checking validity of
the statement to ensure no SQLi vectors occur. We advise always filtering user
input prior to invoking these methods, however, to further protect your
applications.

See http://framework.zend.com/changelog for full details.

Expand Down
106 changes: 31 additions & 75 deletions service/lib/zend/Vagrantfile
Original file line number Diff line number Diff line change
@@ -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"
# ]
2 changes: 1 addition & 1 deletion service/lib/zend/bin/classmap_generator.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Loader
* @subpackage Exception
* @copyright Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand Down
2 changes: 1 addition & 1 deletion service/lib/zend/bin/zf.bat
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ REM obtain it through the world-wide-web, please send an email
REM to [email protected] so we can send you a copy immediately.
REM
REM Zend
REM Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com)
REM Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
REM http://framework.zend.com/license/new-bsd New BSD License


Expand Down
Loading

0 comments on commit 297b6c1

Please sign in to comment.