Skip to content

Commit e3468e2

Browse files
committed
Bumped required PHP version to 5.3.9, due to PHP#43200 having been solved since then;
Spell check fixes.
1 parent fa0f3e7 commit e3468e2

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
composer.phar
2+
vendor/

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
"issues": "http://github.com/pear2/Cache_SHM/issues",
1616
"wiki": "http://github.com/pear2/Cache_SHM/wiki"
1717
},
18+
1819
"require": {
19-
"php": ">=5.3.0"
20+
"php": ">=5.3.9"
2021
},
2122
"suggest": {
2223
"ext-apc": ">=3.0.13",

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<dependencies>
106106
<required>
107107
<php>
108-
<min>5.3.0</min>
108+
<min>5.3.9</min>
109109
</php>
110110
<pearinstaller>
111111
<min>1.4.0</min>

src/PEAR2/Cache/SHM.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ abstract class SHM implements IteratorAggregate
5757
/**
5858
* Creates a new shared memory storage.
5959
*
60-
* Estabilishes a separate persistent storage. Adapter is automatically
60+
* Establishes a separate persistent storage. Adapter is automatically
6161
* chosen based on the available extensions.
6262
*
6363
* @param string $persistentId The ID for the storage.
@@ -207,7 +207,7 @@ public function __unset($key)
207207
/**
208208
* Creates a new shared memory storage.
209209
*
210-
* Estabilishes a separate persistent storage.
210+
* Establishes a separate persistent storage.
211211
*
212212
* @param string $persistentId The ID for the storage. The storage will be
213213
* reused if it exists, or created if it doesn't exist. Data and locks
@@ -220,7 +220,7 @@ abstract public function __construct($persistentId);
220220
*
221221
* @param string $key Name of the key to obtain. Note that $key may
222222
* repeat for each distinct $persistentId.
223-
* @param double $timeout If the lock can't be immediatly obtained, the
223+
* @param double $timeout If the lock can't be immediately obtained, the
224224
* script will block for at most the specified amount of seconds.
225225
* Setting this to 0 makes lock obtaining non blocking, and setting it
226226
* to NULL makes it block without a time limit.

src/PEAR2/Cache/SHM/Adapter/APC.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ class APC extends SHM
5353
* (as a value) specifying the number of instances in the current request.
5454
* Used as an attempt to ensure implicit lock releases even on errors in the
5555
* critical sections, since APC doesn't have an actual locking function.
56+
*
5657
* @var array
5758
*/
5859
protected static $requestInstances = array();
@@ -66,7 +67,7 @@ class APC extends SHM
6667
/**
6768
* Creates a new shared memory storage.
6869
*
69-
* Estabilishes a separate persistent storage.
70+
* Establishes a separate persistent storage.
7071
*
7172
* @param string $persistentId The ID for the storage. The storage will be
7273
* reused if it exists, or created if it doesn't exist. Data and locks
@@ -144,7 +145,7 @@ public function __destruct()
144145
*
145146
* @param string $key Name of the key to obtain. Note that $key may
146147
* repeat for each distinct $persistentId.
147-
* @param double $timeout If the lock can't be immediatly obtained, the
148+
* @param double $timeout If the lock can't be immediately obtained, the
148149
* script will block for at most the specified amount of seconds.
149150
* Setting this to 0 makes lock obtaining non blocking, and setting it
150151
* to NULL makes it block without a time limit.

src/PEAR2/Cache/SHM/Adapter/Placebo.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
use ArrayObject;
3232

3333
/**
34-
* This adapter is not truly persistent. It is intended to emulate persistency
34+
* This adapter is not truly persistent. It is intended to emulate persistence
3535
* in non persistent environments, so that upper level applications can use a
3636
* single code path for persistent and non persistent code.
3737
*
@@ -71,14 +71,15 @@ class Placebo extends SHM
7171
* Each such array has data keys as its keys, and an array as a value.
7272
* Each such array has as its elements the value, the timeout and the time
7373
* the data was set.
74+
*
7475
* @var array
7576
*/
7677
protected static $data = array();
7778

7879
/**
7980
* Creates a new shared memory storage.
8081
*
81-
* Estabilishes a separate persistent storage.
82+
* Establishes a separate persistent storage.
8283
*
8384
* @param string $persistentId The ID for the storage. The storage will be
8485
* reused if it exists, or created if it doesn't exist. Data and locks

src/PEAR2/Cache/SHM/Adapter/Wincache.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ class Wincache extends SHM
5252
* A list of persistent IDs within the current request (as keys) with an int
5353
* (as a value) specifying the number of instances in the current request.
5454
* Used as an attempt to ensure implicit lock releases on destruction.
55+
*
5556
* @var array
5657
*/
5758
protected static $requestInstances = array();
@@ -64,7 +65,7 @@ class Wincache extends SHM
6465
/**
6566
* Creates a new shared memory storage.
6667
*
67-
* Estabilishes a separate persistent storage.
68+
* Establishes a separate persistent storage.
6869
*
6970
* @param string $persistentId The ID for the storage. The storage will be
7071
* reused if it exists, or created if it doesn't exist. Data and locks
@@ -135,7 +136,7 @@ public function __destruct()
135136
* @param string $key Name of the key to obtain. Note that $key may
136137
* repeat for each distinct $persistentId.
137138
* @param double $timeout Ignored with WinCache. Script will always block if
138-
* the lock can't be immediatly obtained.
139+
* the lock can't be immediately obtained.
139140
*
140141
* @return bool TRUE on success, FALSE on failure.
141142
*/

0 commit comments

Comments
 (0)