diff --git a/service/lib/zend/.gitattributes b/service/lib/zend/.gitattributes new file mode 100644 index 000000000..fce541388 --- /dev/null +++ b/service/lib/zend/.gitattributes @@ -0,0 +1,3 @@ +/demos export-ignore +/tests export-ignore +/documentation export-ignore diff --git a/service/lib/zend/.gitignore b/service/lib/zend/.gitignore index 9f08708f2..1f14d26aa 100644 --- a/service/lib/zend/.gitignore +++ b/service/lib/zend/.gitignore @@ -1,3 +1,4 @@ +.vagrant tests/Zend/Db/Table/_files/cachefiles/* tests/Zend/Auth/Adapter/OpenId/_files/* tests/Zend/Filter/_files/Compress/* diff --git a/service/lib/zend/.travis.yml b/service/lib/zend/.travis.yml index c16a93b03..9f000393f 100644 --- a/service/lib/zend/.travis.yml +++ b/service/lib/zend/.travis.yml @@ -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: @@ -30,4 +40,5 @@ script: matrix: allow_failures: + - php: 7 - php: hhvm diff --git a/service/lib/zend/CONTRIBUTING.md b/service/lib/zend/CONTRIBUTING.md index 2894df591..c864e957b 100644 --- a/service/lib/zend/CONTRIBUTING.md +++ b/service/lib/zend/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). \ No newline at end of file +For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc). diff --git a/service/lib/zend/DEVELOPMENT_README.md b/service/lib/zend/DEVELOPMENT_README.md index 16b2ebc6a..24195b52f 100644 --- a/service/lib/zend/DEVELOPMENT_README.md +++ b/service/lib/zend/DEVELOPMENT_README.md @@ -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 \ No newline at end of file diff --git a/service/lib/zend/LICENSE.txt b/service/lib/zend/LICENSE.txt index 5ad81e922..6eab5aa14 100644 --- a/service/lib/zend/LICENSE.txt +++ b/service/lib/zend/LICENSE.txt @@ -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, diff --git a/service/lib/zend/README.md b/service/lib/zend/README.md index 183657136..911b40460 100644 --- a/service/lib/zend/README.md +++ b/service/lib/zend/README.md @@ -1,5 +1,16 @@ ![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) @@ -7,26 +18,21 @@ Master: [![Build Status](https://api.travis-ci.org/zendframework/zf1.png?branch= 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. diff --git a/service/lib/zend/Vagrantfile b/service/lib/zend/Vagrantfile index cfb8e875d..f0c603d96 100644 --- a/service/lib/zend/Vagrantfile +++ b/service/lib/zend/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 = < + + + + +
+ +JQuery application resource
+Example configuration:
++ resources.Jquery.noconflictmode = false ; default + resources.Jquery.version = 1.7.1 ;++ resources.Jquery.localpath = "/foo/bar" + resources.Jquery.enable = true + resources.Jquery.uienable = true; + resources.Jquery.ui_enable = true; + resources.Jquery.uiversion = 0.7.7; + resources.Jquery.ui_version = 0.7.7; + resources.Jquery.uilocalpath = "/bar/foo"; + resources.Jquery.ui_localpath = "/bar/foo"; + resources.Jquery.cdn_ssl = false + resources.Jquery.render_mode = 255 ; default + resources.Jquery.rendermode = 255 ; default + + resources.Jquery.javascriptfile = "/some/file.js" + resources.Jquery.javascriptfiles.0 = "/some/file.js" + resources.Jquery.stylesheet = "/some/file.css" + resources.Jquery.stylesheets.0 = "/some/file.css" +
Resource for settings JQuery options
uses | ++ |
---|---|
category | +ZendX | +
package | +ZendX_Application | +
subpackage | +Resource | +
copyright | +Copyright (c) 2005-2014 Zend Technologies USA Inc. (http://www.zend.com) | +
license | +New BSD License | +
getJquery() : \ZendX_JQuery_View_Helper_JQuery_Container+ +
\ZendX_JQuery_View_Helper_JQuery_Container
init() : \ZendX_JQuery_View_Helper_JQuery_Container+ +
\ZendX_JQuery_View_Helper_JQuery_Container
_parseOptions(array $options) : void+ +
array
+$_jquery : \ZendX_JQuery_View_Helper_JQuery_Container+
$_view : \Zend_View+