This repository has been archived by the owner on Jan 31, 2020. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'refs/pull/3689/head' of github.com:zendframework/zf2 in…
…to hotfix/3684
- Loading branch information
132 parents
f6a6b75
+
300993b
+
3fa60b1
+
56e7a3b
+
f66fb69
+
65e3dc5
+
893db4e
+
1f95227
+
37eba61
+
a8a134d
+
2a58e81
+
c687156
+
ff43991
+
bad6a8b
+
aba47b0
+
955d97a
+
2b78fdc
+
0094c19
+
4985e6d
+
d904244
+
52367d8
+
dce778a
+
2305c94
+
052b9a4
+
ef11064
+
4efb47c
+
b3dcf28
+
778fbea
+
cdde9b4
+
6ade9b9
+
435888b
+
2ad89a8
+
e232251
+
5932189
+
d0360d2
+
52242e5
+
3804b57
+
1cecc58
+
4a4065c
+
f9b61b5
+
0a07b63
+
0e321e0
+
95ceb90
+
4380d08
+
ec9c36c
+
4de92b2
+
b6eb950
+
fca746d
+
ff69119
+
5351804
+
3617ea6
+
24c8a1f
+
0aa6c03
+
b24267c
+
beadb3c
+
51c4ced
+
d92ccc9
+
eb1f131
+
f383de1
+
abc631a
+
666ec86
+
e22a167
+
bb8b8f6
+
b55f760
+
f23a913
+
9ba9f17
+
d01f94f
+
9c4e0cc
+
63c4a7e
+
9eedf95
+
980bffb
+
03cf7b3
+
8bbf35d
+
aff3454
+
1c6567c
+
a102513
+
90b7795
+
286539e
+
7f08291
+
417d368
+
ae0f13d
+
7894420
+
8ff1b30
+
55ca16f
+
0c6cb6c
+
7010e32
+
745a36a
+
f021693
+
cd91ba2
+
5586879
+
1cd9259
+
b611b41
+
e07e054
+
7657d67
+
52b6014
+
00211c2
+
0d594de
+
f919c63
+
7e217f4
+
3e0da00
+
3723e41
+
facd3ee
+
4d8294f
+
3cdb12a
+
f09df31
+
34e6a86
+
4e1b451
+
2d3566a
+
ef9466a
+
3c172af
+
2260c5e
+
dd964bc
+
f325c01
+
3cd4478
+
dc3a58e
+
cf0af6f
+
6e93d7b
+
6b3eedb
+
ce63e39
+
1bd656e
+
cc16778
+
720b563
+
039e86a
+
b27a1fe
+
88022d1
+
b4847de
+
1b48124
+
6a22f1e
+
b63de1e
+
770056f
+
9e9a6cb
+
93f25d1
commit eb95dbb
Showing
6 changed files
with
110 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
*/ | ||
|
||
namespace Zend\Session; | ||
|
||
/** | ||
* Session storage container for PHP 5.3.3 and less | ||
*/ | ||
class Container extends AbstractContainer | ||
{ | ||
/** | ||
* Exchange the current array with another array or object. | ||
* | ||
* @param array|object $input | ||
* @return array Returns the old array | ||
* @see ArrayObject::exchangeArray() | ||
*/ | ||
public function exchangeArray($input) | ||
{ | ||
return parent::exchangeArrayCompat($input); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<?php | ||
/** | ||
* Zend Framework (http://framework.zend.com/) | ||
* | ||
* @link http://github.com/zendframework/zf2 for the canonical source repository | ||
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com) | ||
* @license http://framework.zend.com/license/new-bsd New BSD License | ||
*/ | ||
|
||
namespace Zend\Session\Storage; | ||
|
||
/** | ||
* PHP 5.3.3 variant of SessionArrayStorage | ||
*/ | ||
class SessionArrayStorage extends AbstractSessionArrayStorage | ||
{ | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<?php | ||
if (version_compare(PHP_VERSION, '5.3.3', 'le')) { | ||
require_once __DIR__ . '/Container.php'; | ||
require_once __DIR__ . '/Storage/SessionArrayStorage.php'; | ||
} |