From a7cc3b0d6beab11afaf5f63a722d569b3a02455e Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sat, 24 Oct 2015 16:11:24 +0200
Subject: [PATCH] PSR-2 reformatting of Memcache.php
---
lib/SimpleSAML/Store/Memcache.php | 98 ++++++++++++++++---------------
1 file changed, 50 insertions(+), 48 deletions(-)
diff --git a/lib/SimpleSAML/Store/Memcache.php b/lib/SimpleSAML/Store/Memcache.php
index d4be5ae1d..d3fc725f5 100644
--- a/lib/SimpleSAML/Store/Memcache.php
+++ b/lib/SimpleSAML/Store/Memcache.php
@@ -5,62 +5,64 @@
*
* @package simpleSAMLphp
*/
-class SimpleSAML_Store_Memcache extends SimpleSAML_Store {
+class SimpleSAML_Store_Memcache extends SimpleSAML_Store
+{
+ /**
+ * Initialize the memcache datastore.
+ */
+ protected function __construct() {
+ }
- /**
- * Initialize the memcache datastore.
- */
- protected function __construct() {
- }
+ /**
+ * Retrieve a value from the datastore.
+ *
+ * @param string $type The datatype.
+ * @param string $key The key.
+ * @return mixed|NULL The value.
+ */
+ public function get($type, $key)
+ {
+ assert('is_string($type)');
+ assert('is_string($key)');
- /**
- * Retrieve a value from the datastore.
- *
- * @param string $type The datatype.
- * @param string $key The key.
- * @return mixed|NULL The value.
- */
- public function get($type, $key) {
- assert('is_string($type)');
- assert('is_string($key)');
+ return SimpleSAML_Memcache::get('simpleSAMLphp.' . $type . '.' . $key);
+ }
- return SimpleSAML_Memcache::get('simpleSAMLphp.' . $type . '.' . $key);
- }
+ /**
+ * Save a value to the datastore.
+ *
+ * @param string $type The datatype.
+ * @param string $key The key.
+ * @param mixed $value The value.
+ * @param int|NULL $expire The expiration time (unix timestamp), or NULL if it never expires.
+ */
+ public function set($type, $key, $value, $expire = null)
+ {
+ assert('is_string($type)');
+ assert('is_string($key)');
+ assert('is_null($expire) || (is_int($expire) && $expire > 2592000)');
- /**
- * Save a value to the datastore.
- *
- * @param string $type The datatype.
- * @param string $key The key.
- * @param mixed $value The value.
- * @param int|NULL $expire The expiration time (unix timestamp), or NULL if it never expires.
- */
- public function set($type, $key, $value, $expire = NULL) {
- assert('is_string($type)');
- assert('is_string($key)');
- assert('is_null($expire) || (is_int($expire) && $expire > 2592000)');
+ if ($expire === null) {
+ $expire = 0;
+ }
- if ($expire === NULL) {
- $expire = 0;
- }
+ SimpleSAML_Memcache::set('simpleSAMLphp.' . $type . '.' . $key, $value, $expire);
+ }
- SimpleSAML_Memcache::set('simpleSAMLphp.' . $type . '.' . $key, $value, $expire);
- }
+ /**
+ * Delete a value from the datastore.
+ *
+ * @param string $type The datatype.
+ * @param string $key The key.
+ */
+ public function delete($type, $key)
+ {
+ assert('is_string($type)');
+ assert('is_string($key)');
- /**
- * Delete a value from the datastore.
- *
- * @param string $type The datatype.
- * @param string $key The key.
- */
- public function delete($type, $key) {
- assert('is_string($type)');
- assert('is_string($key)');
-
- SimpleSAML_Memcache::delete('simpleSAMLphp.' . $type . '.' . $key);
- }
-
+ SimpleSAML_Memcache::delete('simpleSAMLphp.' . $type . '.' . $key);
+ }
}
--
GitLab