Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
wdalmut committed Mar 13, 2012
2 parents 216baa9 + 1024928 commit e37db04
Show file tree
Hide file tree
Showing 214 changed files with 2,459 additions and 1,766 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
nbproject
.idea
.buildpath
.project
.settings/
Expand Down
67 changes: 67 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
# 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 2 requires PHP 5.3.1 or later.

## 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
using git pull.

To clone the git repository, use the following URL:

git://git.zendframework.com/zf.git

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

http://www.git-scm.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/manual/en/learning.quickstart.html

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.
72 changes: 0 additions & 72 deletions INSTALL.txt

This file was deleted.

63 changes: 63 additions & 0 deletions README-DEV.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# CONTRIBUTING

## RESOURCES

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

- ZF2 Requirements:
http://framework.zend.com/wiki/display/ZFDEV2/Zend+Framework+2.0+Requirements
- Coding Standards:
http://framework.zend.com/manual/en/coding-standard.html
- ZF Git Guide:
README-GIT.md
- Contributor's Guide:
http://framework.zend.com/wiki/display/ZFDEV/Contributing+to+Zend+Framework
- ZF Contributor's mailing list:
Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
Subscribe: [email protected]
- ZF Contributor's IRC channel:
#zftalk.dev on Freenode.net

If you are working on new features, or refactoring an existing
component, please create a proposal. You can do this in on the proposals
page, http://framework.zend.com/wiki/display/ZFPROP/Home.

## RUNNING TESTS

The full test suite currently does not run! This is due to some
components not yet being migrated to namespaces, as well as to some
issues we've encountered in refactoring.

To run tests:

- Make sure you have a recent version of PHPUnit installed; 3.5.0
minimally.
- Enter the `tests/` subdirectory.
- Execute PHPUnit, providing a path to a component directory for which
you wish to run tests, or a specific test class file.

```sh
% phpunit ZendTest/Application
% phpunit ZendTest/Application/Resource/CacheManagerTest.php
```

- You may also provide the `--group` switch; in such cases, provide the
top-level component name:

```sh
% phpunit --group Zend_Application
```
This will likely lead to errors, so it's usually best to specify a
specific component in which to run test:
```sh
% phpunit --group ZF-XYZ Zend/Application
```
You can turn on conditional tests with the TestConfiguration.php file.
To do so:
- Enter the `tests/` subdirectory.
- Copy `TestConfiguration.php.dist` file to `TestConfiguration.php`
- Edit `TestConfiguration.php` to enable any specific functionality you
want to test, as well as to provide test values to utilize.
64 changes: 0 additions & 64 deletions README-DEV.txt

This file was deleted.

Loading

0 comments on commit e37db04

Please sign in to comment.