Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.

Commit a0c0349

Browse files
bkendig-disneybkendig-disney
committed
Merge branch 'master' of https://github.com/zendframework/zf1 
2 parents b430be5 + 9b9fda8 commit a0c0349

20 files changed

+142
-120
lines changed

‎.travis.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,22 @@ php:
1111
env: TMPDIR=/tmp
1212

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

1717
services:
1818
- memcached
1919

2020
before_script:
21+
- if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer self-update; fi
22+
- if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then travis_retry composer install --no-interaction --prefer-source --dev; fi
23+
2124
- mysql -e 'create database zftest;'
2225
- psql -c 'create database zftest;' -U postgres
23-
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
24-
- echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
26+
27+
- if [[ "$TRAVIS_PHP_VERSION" != "5.2" ]]; then phpenv config-add tests/config.ini; fi
28+
- if [[ "$TRAVIS_PHP_VERSION" == "5.2" ]]; then phpenv config-add tests/php52_config.ini; fi
29+
2530
- cp ./tests/TestConfiguration.travis.php ./tests/TestConfiguration.php
2631

2732
script:

‎library/Zend/Date.php

Lines changed: 49 additions & 49 deletions
Large diffs are not rendered by default.

‎library/Zend/Ldap.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ public static function prepareLdapEntryArray(array &$entry)
12061206
*
12071207
* @param string|Zend_Ldap_Dn $dn
12081208
* @param array $entry
1209-
* @return Zend_Ldap Provides a fluid interface
1209+
* @return Zend_Ldap Provides a fluent interface
12101210
* @throws Zend_Ldap_Exception
12111211
*/
12121212
public function add($dn, array $entry)
@@ -1254,7 +1254,7 @@ public function add($dn, array $entry)
12541254
*
12551255
* @param string|Zend_Ldap_Dn $dn
12561256
* @param array $entry
1257-
* @return Zend_Ldap Provides a fluid interface
1257+
* @return Zend_Ldap Provides a fluent interface
12581258
* @throws Zend_Ldap_Exception
12591259
*/
12601260
public function update($dn, array $entry)
@@ -1301,7 +1301,7 @@ public function update($dn, array $entry)
13011301
*
13021302
* @param string|Zend_Ldap_Dn $dn
13031303
* @param array $entry
1304-
* @return Zend_Ldap Provides a fluid interface
1304+
* @return Zend_Ldap Provides a fluent interface
13051305
* @throws Zend_Ldap_Exception
13061306
*/
13071307
public function save($dn, array $entry)
@@ -1319,7 +1319,7 @@ public function save($dn, array $entry)
13191319
*
13201320
* @param string|Zend_Ldap_Dn $dn
13211321
* @param boolean $recursively
1322-
* @return Zend_Ldap Provides a fluid interface
1322+
* @return Zend_Ldap Provides a fluent interface
13231323
* @throws Zend_Ldap_Exception
13241324
*/
13251325
public function delete($dn, $recursively = false)
@@ -1386,7 +1386,7 @@ protected function _getChildrenDns($parentDn)
13861386
* @param string|Zend_Ldap_Dn $to
13871387
* @param boolean $recursively
13881388
* @param boolean $alwaysEmulate
1389-
* @return Zend_Ldap Provides a fluid interface
1389+
* @return Zend_Ldap Provides a fluent interface
13901390
* @throws Zend_Ldap_Exception
13911391
*/
13921392
public function moveToSubtree($from, $to, $recursively = false, $alwaysEmulate = false)
@@ -1417,7 +1417,7 @@ public function moveToSubtree($from, $to, $recursively = false, $alwaysEmulate =
14171417
* @param string|Zend_Ldap_Dn $to
14181418
* @param boolean $recursively
14191419
* @param boolean $alwaysEmulate
1420-
* @return Zend_Ldap Provides a fluid interface
1420+
* @return Zend_Ldap Provides a fluent interface
14211421
* @throws Zend_Ldap_Exception
14221422
*/
14231423
public function move($from, $to, $recursively = false, $alwaysEmulate = false)
@@ -1434,7 +1434,7 @@ public function move($from, $to, $recursively = false, $alwaysEmulate = false)
14341434
* @param string|Zend_Ldap_Dn $to
14351435
* @param boolean $recursively
14361436
* @param boolean $alwaysEmulate
1437-
* @return Zend_Ldap Provides a fluid interface
1437+
* @return Zend_Ldap Provides a fluent interface
14381438
* @throws Zend_Ldap_Exception
14391439
*/
14401440
public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
@@ -1479,7 +1479,7 @@ public function rename($from, $to, $recursively = false, $alwaysEmulate = false)
14791479
* @param string|Zend_Ldap_Dn $from
14801480
* @param string|Zend_Ldap_Dn $to
14811481
* @param boolean $recursively
1482-
* @return Zend_Ldap Provides a fluid interface
1482+
* @return Zend_Ldap Provides a fluent interface
14831483
* @throws Zend_Ldap_Exception
14841484
*/
14851485
public function copyToSubtree($from, $to, $recursively = false)
@@ -1507,7 +1507,7 @@ public function copyToSubtree($from, $to, $recursively = false)
15071507
* @param string|Zend_Ldap_Dn $from
15081508
* @param string|Zend_Ldap_Dn $to
15091509
* @param boolean $recursively
1510-
* @return Zend_Ldap Provides a fluid interface
1510+
* @return Zend_Ldap Provides a fluent interface
15111511
* @throws Zend_Ldap_Exception
15121512
*/
15131513
public function copy($from, $to, $recursively = false)

‎library/Zend/Ldap/Node.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public function getLdap()
153153
*
154154
* @uses Zend_Ldap_Dn::isChildOf()
155155
* @param Zend_Ldap $ldap
156-
* @return Zend_Ldap_Node Provides a fluid interface
156+
* @return Zend_Ldap_Node Provides a fluent interface
157157
* @throws Zend_Ldap_Exception
158158
*/
159159
public function attachLdap(Zend_Ldap $ldap)
@@ -184,7 +184,7 @@ public function attachLdap(Zend_Ldap $ldap)
184184
*
185185
* This is an offline method.
186186
*
187-
* @return Zend_Ldap_Node Provides a fluid interface
187+
* @return Zend_Ldap_Node Provides a fluent interface
188188
*/
189189
public function detachLdap()
190190
{
@@ -388,7 +388,7 @@ public function willBeDeleted()
388388
*
389389
* Node will be deleted on calling update() if $delete is true.
390390
*
391-
* @return Zend_Ldap_Node Provides a fluid interface
391+
* @return Zend_Ldap_Node Provides a fluent interface
392392
*/
393393
public function delete()
394394
{
@@ -416,7 +416,7 @@ public function willBeMoved()
416416
* Sends all pending changes to the LDAP server
417417
*
418418
* @param Zend_Ldap $ldap
419-
* @return Zend_Ldap_Node Provides a fluid interface
419+
* @return Zend_Ldap_Node Provides a fluent interface
420420
* @throws Zend_Ldap_Exception
421421
*/
422422
public function update(Zend_Ldap $ldap = null)
@@ -507,7 +507,7 @@ public function getCurrentDn()
507507
*
508508
* @param Zend_Ldap_Dn|string|array $newDn
509509
* @throws Zend_Ldap_Exception
510-
* @return Zend_Ldap_Node Provides a fluid interface
510+
* @return Zend_Ldap_Node Provides a fluent interface
511511
*/
512512
public function setDn($newDn)
513513
{
@@ -527,7 +527,7 @@ public function setDn($newDn)
527527
*
528528
* @param Zend_Ldap_Dn|string|array $newDn
529529
* @throws Zend_Ldap_Exception
530-
* @return Zend_Ldap_Node Provides a fluid interface
530+
* @return Zend_Ldap_Node Provides a fluent interface
531531
*/
532532
public function move($newDn)
533533
{
@@ -541,7 +541,7 @@ public function move($newDn)
541541
*
542542
* @param Zend_Ldap_Dn|string|array $newDn
543543
* @throws Zend_Ldap_Exception
544-
* @return Zend_Ldap_Node Provides a fluid interface
544+
* @return Zend_Ldap_Node Provides a fluent interface
545545
*/
546546
public function rename($newDn)
547547
{
@@ -554,7 +554,7 @@ public function rename($newDn)
554554
* This is an offline method.
555555
*
556556
* @param array|string $value
557-
* @return Zend_Ldap_Node Provides a fluid interface
557+
* @return Zend_Ldap_Node Provides a fluent interface
558558
* @throws Zend_Ldap_Exception
559559
*/
560560
public function setObjectClass($value)
@@ -569,7 +569,7 @@ public function setObjectClass($value)
569569
* This is an offline method.
570570
*
571571
* @param array|string $value
572-
* @return Zend_Ldap_Node Provides a fluid interface
572+
* @return Zend_Ldap_Node Provides a fluent interface
573573
* @throws Zend_Ldap_Exception
574574
*/
575575
public function appendObjectClass($value)
@@ -653,7 +653,7 @@ public function getChanges()
653653
*
654654
* @param string $name
655655
* @param mixed $value
656-
* @return Zend_Ldap_Node Provides a fluid interface
656+
* @return Zend_Ldap_Node Provides a fluent interface
657657
* @throws Zend_Ldap_Exception
658658
*/
659659
public function setAttribute($name, $value)
@@ -669,7 +669,7 @@ public function setAttribute($name, $value)
669669
*
670670
* @param string $name
671671
* @param mixed $value
672-
* @return Zend_Ldap_Node Provides a fluid interface
672+
* @return Zend_Ldap_Node Provides a fluent interface
673673
* @throws Zend_Ldap_Exception
674674
*/
675675
public function appendToAttribute($name, $value)
@@ -700,7 +700,7 @@ protected function _setAttribute($name, $value, $append)
700700
* @param string $name
701701
* @param integer|array $value
702702
* @param boolean $utc
703-
* @return Zend_Ldap_Node Provides a fluid interface
703+
* @return Zend_Ldap_Node Provides a fluent interface
704704
* @throws Zend_Ldap_Exception
705705
*/
706706
public function setDateTimeAttribute($name, $value, $utc = false)
@@ -717,7 +717,7 @@ public function setDateTimeAttribute($name, $value, $utc = false)
717717
* @param string $name
718718
* @param integer|array $value
719719
* @param boolean $utc
720-
* @return Zend_Ldap_Node Provides a fluid interface
720+
* @return Zend_Ldap_Node Provides a fluent interface
721721
* @throws Zend_Ldap_Exception
722722
*/
723723
public function appendToDateTimeAttribute($name, $value, $utc = false)
@@ -747,7 +747,7 @@ protected function _setDateTimeAttribute($name, $value, $utc, $append)
747747
* @param string $password
748748
* @param string $hashType
749749
* @param string $attribName
750-
* @return Zend_Ldap_Node Provides a fluid interface
750+
* @return Zend_Ldap_Node Provides a fluent interface
751751
* @throws Zend_Ldap_Exception
752752
*/
753753
public function setPasswordAttribute($password, $hashType = Zend_Ldap_Attribute::PASSWORD_HASH_MD5,
@@ -766,7 +766,7 @@ public function setPasswordAttribute($password, $hashType = Zend_Ldap_Attribute:
766766
* This is an offline method.
767767
*
768768
* @param string $name
769-
* @return Zend_Ldap_Node Provides a fluid interface
769+
* @return Zend_Ldap_Node Provides a fluent interface
770770
* @throws Zend_Ldap_Exception
771771
*/
772772
public function deleteAttribute($name)
@@ -920,7 +920,7 @@ public function exists(Zend_Ldap $ldap = null)
920920
* This is an online method.
921921
*
922922
* @param Zend_Ldap $ldap
923-
* @return Zend_Ldap_Node Provides a fluid interface
923+
* @return Zend_Ldap_Node Provides a fluent interface
924924
* @throws Zend_Ldap_Exception
925925
*/
926926
public function reload(Zend_Ldap $ldap = null)

‎library/Zend/Ldap/Node/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ protected function _loadData(array $data, $fromDataSource)
9595
* This is an online method.
9696
*
9797
* @param Zend_Ldap $ldap
98-
* @return Zend_Ldap_Node_Abstract Provides a fluid interface
98+
* @return Zend_Ldap_Node_Abstract Provides a fluent interface
9999
* @throws Zend_Ldap_Exception
100100
*/
101101
public function reload(Zend_Ldap $ldap = null)

‎library/Zend/Ldap/Node/Schema.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ protected function __construct(Zend_Ldap_Dn $dn, array $data, Zend_Ldap $ldap)
9191
*
9292
* @param Zend_Ldap_Dn $dn
9393
* @param Zend_Ldap $ldap
94-
* @return Zend_Ldap_Node_Schema Provides a fluid interface
94+
* @return Zend_Ldap_Node_Schema Provides a fluent interface
9595
*/
9696
protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
9797
{

‎library/Zend/Ldap/Node/Schema/ActiveDirectory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class Zend_Ldap_Node_Schema_ActiveDirectory extends Zend_Ldap_Node_Schema
6363
*
6464
* @param Zend_Ldap_Dn $dn
6565
* @param Zend_Ldap $ldap
66-
* @return Zend_Ldap_Node_Schema Provides a fluid interface
66+
* @return Zend_Ldap_Node_Schema Provides a fluent interface
6767
*/
6868
protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
6969
{

‎library/Zend/Ldap/Node/Schema/Item.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(array $data)
5353
* Sets the data
5454
*
5555
* @param array $data
56-
* @return Zend_Ldap_Node_Schema_Item Provides a fluid interface
56+
* @return Zend_Ldap_Node_Schema_Item Provides a fluent interface
5757
*/
5858
public function setData(array $data)
5959
{

‎library/Zend/Ldap/Node/Schema/OpenLdap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class Zend_Ldap_Node_Schema_OpenLdap extends Zend_Ldap_Node_Schema
8181
*
8282
* @param Zend_Ldap_Dn $dn
8383
* @param Zend_Ldap $ldap
84-
* @return Zend_Ldap_Node_Schema Provides a fluid interface
84+
* @return Zend_Ldap_Node_Schema Provides a fluent interface
8585
*/
8686
protected function _parseSchema(Zend_Ldap_Dn $dn, Zend_Ldap $ldap)
8787
{

‎library/Zend/Validate/Barcode/AdapterInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function getCheck();
6262
* Sets the checksum validation
6363
*
6464
* @param boolean $check
65-
* @return Zend_Validate_Barcode_Adapter Provides fluid interface
65+
* @return Zend_Validate_Barcode_Adapter Provides a fluent interface
6666
*/
6767
public function setCheck($check);
6868
}

0 commit comments

Comments
 (0)