Skip to content

Commit

Permalink
Bumped required PHP version to 5.3.9, due to PHP#43200 having been so…
Browse files Browse the repository at this point in the history
…lved since then;

Spell check fixes.
  • Loading branch information
boenrobot committed Dec 24, 2014
1 parent fa0f3e7 commit e3468e2
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
composer.phar
vendor/
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@
"issues": "http://github.com/pear2/Cache_SHM/issues",
"wiki": "http://github.com/pear2/Cache_SHM/wiki"
},

"require": {
"php": ">=5.3.0"
"php": ">=5.3.9"
},
"suggest": {
"ext-apc": ">=3.0.13",
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<dependencies>
<required>
<php>
<min>5.3.0</min>
<min>5.3.9</min>
</php>
<pearinstaller>
<min>1.4.0</min>
Expand Down
6 changes: 3 additions & 3 deletions src/PEAR2/Cache/SHM.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ abstract class SHM implements IteratorAggregate
/**
* Creates a new shared memory storage.
*
* Estabilishes a separate persistent storage. Adapter is automatically
* Establishes a separate persistent storage. Adapter is automatically
* chosen based on the available extensions.
*
* @param string $persistentId The ID for the storage.
Expand Down Expand Up @@ -207,7 +207,7 @@ public function __unset($key)
/**
* Creates a new shared memory storage.
*
* Estabilishes a separate persistent storage.
* Establishes a separate persistent storage.
*
* @param string $persistentId The ID for the storage. The storage will be
* reused if it exists, or created if it doesn't exist. Data and locks
Expand All @@ -220,7 +220,7 @@ abstract public function __construct($persistentId);
*
* @param string $key Name of the key to obtain. Note that $key may
* repeat for each distinct $persistentId.
* @param double $timeout If the lock can't be immediatly obtained, the
* @param double $timeout If the lock can't be immediately obtained, the
* script will block for at most the specified amount of seconds.
* Setting this to 0 makes lock obtaining non blocking, and setting it
* to NULL makes it block without a time limit.
Expand Down
5 changes: 3 additions & 2 deletions src/PEAR2/Cache/SHM/Adapter/APC.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ class APC extends SHM
* (as a value) specifying the number of instances in the current request.
* Used as an attempt to ensure implicit lock releases even on errors in the
* critical sections, since APC doesn't have an actual locking function.
*
* @var array
*/
protected static $requestInstances = array();
Expand All @@ -66,7 +67,7 @@ class APC extends SHM
/**
* Creates a new shared memory storage.
*
* Estabilishes a separate persistent storage.
* Establishes a separate persistent storage.
*
* @param string $persistentId The ID for the storage. The storage will be
* reused if it exists, or created if it doesn't exist. Data and locks
Expand Down Expand Up @@ -144,7 +145,7 @@ public function __destruct()
*
* @param string $key Name of the key to obtain. Note that $key may
* repeat for each distinct $persistentId.
* @param double $timeout If the lock can't be immediatly obtained, the
* @param double $timeout If the lock can't be immediately obtained, the
* script will block for at most the specified amount of seconds.
* Setting this to 0 makes lock obtaining non blocking, and setting it
* to NULL makes it block without a time limit.
Expand Down
5 changes: 3 additions & 2 deletions src/PEAR2/Cache/SHM/Adapter/Placebo.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
use ArrayObject;

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

/**
* Creates a new shared memory storage.
*
* Estabilishes a separate persistent storage.
* Establishes a separate persistent storage.
*
* @param string $persistentId The ID for the storage. The storage will be
* reused if it exists, or created if it doesn't exist. Data and locks
Expand Down
5 changes: 3 additions & 2 deletions src/PEAR2/Cache/SHM/Adapter/Wincache.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ class Wincache extends SHM
* A list of persistent IDs within the current request (as keys) with an int
* (as a value) specifying the number of instances in the current request.
* Used as an attempt to ensure implicit lock releases on destruction.
*
* @var array
*/
protected static $requestInstances = array();
Expand All @@ -64,7 +65,7 @@ class Wincache extends SHM
/**
* Creates a new shared memory storage.
*
* Estabilishes a separate persistent storage.
* Establishes a separate persistent storage.
*
* @param string $persistentId The ID for the storage. The storage will be
* reused if it exists, or created if it doesn't exist. Data and locks
Expand Down Expand Up @@ -135,7 +136,7 @@ public function __destruct()
* @param string $key Name of the key to obtain. Note that $key may
* repeat for each distinct $persistentId.
* @param double $timeout Ignored with WinCache. Script will always block if
* the lock can't be immediatly obtained.
* the lock can't be immediately obtained.
*
* @return bool TRUE on success, FALSE on failure.
*/
Expand Down

0 comments on commit e3468e2

Please sign in to comment.