Skip to content

Commit

Permalink
Merge branch '1.12.13' into ioc-1.12.13
Browse files Browse the repository at this point in the history
* 1.12.13: (668 commits)
  [1.12.13] Release readiness
  Fixes for unit tests
  Cast int and float to string when creating headers
  Bump to next dev version
  [1.12.12] Release readiness
  Updated README with ZF2015-04 details
  [ZF2015-04] Fix CRLF injections in HTTP and Mail
  Added test for zendframeworkGH-564
  Adds unit test for parent locale in Zend_Currency
  Fixes zendframework#516 - Zend_Locale does not honor parentLocale configuration
  Adds test for locale without parent local in Zend_Locale_DataTest
  Extends Zend_Locale_Data::getContent for reading parent locales
  Allow early suppressing of file not found warnings
  Fixes zendframework#561 - Zend_Date not expected year
  (sk) tfix
  Fixes zendframework#557 - Dependencies table unreadable
  Fixes wrong exceptions in Audioscrobbler unit test
  Fixes zendframework#550 - Zend_Http_UserAgent_AbstractDevice undefined index
  Fixed typo in Zend_View_Helper_Navigation_HelperAbstract
  Updated class name in PHPDoc
  ...

Conflicts:
	.gitignore
	README.md
	composer.json
  • Loading branch information
Ben Getsug committed Aug 12, 2015
2 parents 1cec815 + 9c9361f commit 9a97d40
Show file tree
Hide file tree
Showing 5,442 changed files with 521,210 additions and 131,604 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 .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/demos export-ignore
/tests export-ignore
/documentation export-ignore
13 changes: 12 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
.idea
composer.lock
vendor
tests/Zend/Db/Table/_files/cachefiles/*
tests/Zend/Auth/Adapter/OpenId/_files/*
tests/Zend/Filter/_files/Compress/*
tests/Zend/Filter/_files/Users/*
tests/Zend/OpenId/Provider/Storage/_files/*
tests/Zend/OpenId/_files/*
tests/Zend/Translate/Adapter/_files/zend_cache---internal-metadatas---testid
tests/Zend/Translate/Adapter/_files/zend_cache---testid
tests/TestConfiguration.php
vendor/*
bin/dbunit
bin/phpunit
41 changes: 41 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
language: php

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

env: TMPDIR=/tmp

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

services:
- memcached

before_script:
- 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

- 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:
- cd tests/
- php runalltests.php

matrix:
allow_failures:
- php: 7
- php: hhvm
41 changes: 41 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# CONTRIBUTING

> **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).**

## RESOURCES

If you wish to contribute to Zend Framework, please be sure to
read/subscribe to the following resources:

- Coding Standards:
http://framework.zend.com/manual/1.12/en/coding-standard.html
- ZF Git Guide:
[README-GIT.md](README-GIT.md)
- Contributor's Guide:
http://framework.zend.com/participate/contributor-guide-v1
- ZF Contributor's mailing list:
Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
Subscribe: zf-contributors-subscribe@lists.zend.com
- ZF Contributor's IRC channel:
#zftalk.dev on Freenode.net

## Reporting Potential Security Issues

If you have encountered a potential security vulnerability in Zend Framework,
please report it to us at [zf-security@zend.com](mailto:zf-security@zend.com).
We will work with you to verify the vulnerability and patch it.

When reporting issues, please provide the following information:

- Component(s) affected
- A description indicating how to reproduce the issue
- A summary of the security vulnerability and impact

We request that you contact us via the email address above and give the project
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).
63 changes: 63 additions & 0 deletions DEVELOPMENT_README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# 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/)

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

### 4. SSH into the VM

vagrant ssh

### 5. Build a version of PHP.

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

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

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

## 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
55 changes: 0 additions & 55 deletions DEVELOPMENT_README.txt

This file was deleted.

89 changes: 89 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
INSTALLATION
------------

Zend Framework requires no special installation steps. Simply download the framework,
extract it to the folder you would like to keep it in, and add the library directory
to your PHP `include_path`. To use components in the extras library, add the extras/library
directory to your PHP `include_path`, as well.
If you would like to use `Zend_Tool`, simply add `bin/zf.bat` (for Windows) or
`bin/zf.sh` (for anything else) to your system executable path.

SYSTEM REQUIREMENTS
-------------------

Zend Framework requires PHP 5.2.11 or later. Please see the system requirements
appendix for more detailed information:

- http://framework.zend.com/manual/en/requirements.html

DEVELOPMENT VERSIONS
--------------------

If you would like to preview enhancements or bug fixes that have not yet been
released, you can obtain the current development version of Zend Framework using one
of the following methods:

* Using a git client. Zend Framework is open source software, and
the git repository used for its development is publicly available. Consider
using git to get Zend Framework if you already use git for your application
development, want to contribute back to the framework, or need to upgrade your
framework version very often.

Checking out a working copy is necessary if you would like to directly contribute
to Zend Framework; a working copy can be updated any time with `git fetch &&
git rebase origin/master`.

A git submodules definition is highly convenient for developers already using
git to manage their application working copies.

The URL for the the Zend Framework 1.X git repository is:

- https://github.com/zendframework/zf1

For more information about git, please see the official website:

- http://git-scm.com

* Using Subversion. You may pin an svn:externals definition to our repository.
For versions prior to 1.12.0, use the following URLs:

- http://framework.zend.com/svn/framework/standard/branches/release-1.{minor version}
- http://framework.zend.com/svn/framework/standard/tags/release-1.{minor version}.{maintenance version}
- http://framework.zend.com/svn/framework/extras/branches/release-1.{minor version}

For versions 1.12.0 and on, use the following URLs:

- https://github.com/zendframework/zf1/trunk (development version)
- https://github.com/zendframework/zf1/tags/release-1.12.{maintenance version}
- https://github.com/zendframework/zf1-extras/trunk

For more information on subversion, please visit the official website:

- http://subversion.apache.org/

CONFIGURING THE INCLUDE PATH
----------------------------

Once you have a copy of Zend Framework available, your application will need to
access the framework classes. Though there are several ways to achieve this, your
PHP `include_path` needs to contain the path to the Zend Framework classes under the
`/library` directory in this distribution. You can find out more about the PHP
`include_path` configuration directive here:

- http://www.php.net/manual/en/ini.core.php#ini.include-path

Instructions on how to change PHP configuration directives can be found here:

- http://www.php.net/manual/en/configuration.changes.php

GETTING STARTED
---------------

A great place to get up-to-speed quickly is the Zend Framework QuickStart:

- http://framework.zend.com/docs/quickstart

The QuickStart covers some of the most commonly used components of ZF. Since
Zend Framework is designed with a use-at-will architecture and components are
loosely coupled, you can select and use only those components that are needed for
your project.
Loading

0 comments on commit 9a97d40

Please sign in to comment.