update deprecated preg_replace call, remove PHP closing tags

Mogreet.php

@@ -31,7 +31,7 @@ class Mogreet
     private $token;
     private $defaultFormat;
 
-    public function __construct($clientId, $token) 
+    public function __construct($clientId, $token)
     {
         $this->clientId      = $clientId;
         $this->token         = $token;
@@ -44,18 +44,16 @@ public function __construct($clientId, $token)
         $this->list          = new Mogreet_List($this);
     }
 
-    public function processRequest($base, $api, array $params = array(), $multipart = false) 
+    public function processRequest($base, $api, array $params = array(), $multipart = false)
     {
         // TODO implement flag to do post/get
         $params = array_merge($params, $this->_getDefaultApiParams());
         $data = Mogreet_Request::postRequest($base, $api, $params, $multipart);
         return new Mogreet_Response($params['format'], $data);
     }
 
-    protected function _getDefaultApiParams() 
+    protected function _getDefaultApiParams()
     {
         return [ "client_id" => $this->clientId, "token" => $this->token, "format" => $this->defaultFormat ];
     }
 }
-
-?>

lib/Exception.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_Exception 
+class Mogreet_Exception
     extends Exception
 {
     protected $api;
@@ -13,15 +13,13 @@ public function __construct($message, $api = '', $params = null, $code = 0)
         parent::__construct($message, $code);
     }
 
-    public function getApi() 
+    public function getApi()
     {
         return $this->api;
     }
 
-    public function getParams() 
+    public function getParams()
     {
         return $this->params;
     }
 }
-
-?>

lib/Keyword.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_Keyword 
+class Mogreet_Keyword
 {
     private $client;
 
@@ -9,26 +9,24 @@ public function __construct(Mogreet $client)
         $this->client = $client;
     }
 
-    public function listAll(array $params = array()) 
+    public function listAll(array $params = array())
     {
         return $this->client->processRequest('cm', 'keyword.list', $params);
     }
 
     public function check(array $params = array())
     {
         return $this->client->processRequest('cm', 'keyword.check', $params);
-    } 
+    }
 
     public function add(array $params = array())
     {
         return $this->client->processRequest('cm', 'keyword.add', $params);
-    } 
+    }
 
     public function remove(array $params = array())
     {
         return $this->client->processRequest('cm', 'keyword.remove', $params);
-    } 
+    }
 
 }
-
-?>

lib/List.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_List 
+class Mogreet_List
 {
     private $client;
 
@@ -9,50 +9,48 @@ public function __construct(Mogreet $client)
         $this->client = $client;
     }
 
-    public function destroy(array $params = array()) 
+    public function destroy(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.destroy', $params);
     }
 
-    public function pruneAll(array $params = array()) 
+    public function pruneAll(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.empty', $params);
     }
 
-    public function download(array $params = array()) 
+    public function download(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.download', $params);
     }
 
-    public function send(array $params = array()) 
+    public function send(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.send', $params);
     }
 
-    public function prune(array $params = array()) 
+    public function prune(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.prune', $params);
     }
 
-    public function append(array $params = array()) 
+    public function append(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.append', $params);
     }
 
-    public function create(array $params = array()) 
+    public function create(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.create', $params);
     }
 
-    public function listAll(array $params = array()) 
+    public function listAll(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.list', $params);
     }
 
-    public function info(array $params = array()) 
+    public function info(array $params = array())
     {
         return $this->client->processRequest('cm', 'list.info', $params);
     }
 }
-
-?>

lib/Media.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_Media 
+class Mogreet_Media
 {
     private $client;
 
@@ -9,7 +9,7 @@ public function __construct(Mogreet $client)
         $this->client = $client;
     }
 
-    public function remove($contentId, array $params = array()) 
+    public function remove($contentId, array $params = array())
     {
         return $this->client->processRequest('cm', 'media.remove', $params);
     }
@@ -19,7 +19,7 @@ public function listAll(array $params = array())
         return $this->client->processRequest('cm', 'media.list', $params);
     }
 
-    public function upload(array $params = array()) 
+    public function upload(array $params = array())
     {
         if (isset($params['file'])) {
             // uploading a file located on the server
@@ -31,5 +31,3 @@ public function upload(array $params = array())
         return $this->client->processRequest('cm', 'media.upload', $params, true);
     }
 }
-
-?>

lib/Request.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_Request 
+class Mogreet_Request
 {
     private static $_requiredParams = array(
         'system.ping'        => array(),
@@ -39,7 +39,7 @@ protected static function _checkParams($api, $params)
         }
     }
 
-    public static function postRequest($base, $api, $params, $multipart) 
+    public static function postRequest($base, $api, $params, $multipart)
     {
         Mogreet_Request::_checkParams($api, $params);
 
@@ -66,5 +66,3 @@ public static function postRequest($base, $api, $params, $multipart)
         return $data;
     }
 }
-
-?>

lib/Response.php

@@ -1,33 +1,31 @@
 <?php
 
-class Mogreet_Response 
+class Mogreet_Response
 {
     private $format;
     private $data;
     private $obj;
 
-    public function __construct($format, $data) 
+    public function __construct($format, $data)
     {
         $this->format = $format;
         $this->data = $data;
         $this->buildObjectFromJson();
     }
 
-    protected function buildObjectFromJson() 
+    protected function buildObjectFromJson()
     {
         /* $this->obj = json_decode($this->data); */
         $this->obj = Mogreet_Utils::json_to_object(json_decode($this->data, true));
     }
 
-    public function __get($property) 
+    public function __get($property)
     {
         return $this->obj->response->$property;
     }
 
-    public function __toString() 
+    public function __toString()
     {
         return $this->data;
     }
 }
-
-?>

lib/System.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_System 
+class Mogreet_System
 {
     private $client;
 
@@ -9,10 +9,8 @@ public function __construct(Mogreet $client)
         $this->client = $client;
     }
 
-    public function ping(array $params = array()) 
+    public function ping(array $params = array())
     {
         return $this->client->processRequest('moms', 'system.ping', $params);
     }
 }
-
-?>

lib/Transaction.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_Transaction 
+class Mogreet_Transaction
 {
     protected $client;
 
@@ -9,15 +9,13 @@ public function __construct(Mogreet $client)
         $this->client = $client;
     }
 
-    public function send(array $params = array()) 
+    public function send(array $params = array())
     {
         return $this->client->processRequest('moms', 'transaction.send', $params);
     }
 
     public function lookup(array $params = array())
     {
         return $this->client->processRequest('moms', 'transaction.lookup', $params);
-    } 
+    }
 }
-
-?>

lib/User.php

@@ -1,6 +1,6 @@
 <?php
 
-class Mogreet_User 
+class Mogreet_User
 {
     private $client;
 
@@ -9,30 +9,28 @@ public function __construct(Mogreet $client)
         $this->client = $client;
     }
 
-    public function transactions(array $params = array()) 
+    public function transactions(array $params = array())
     {
         return $this->client->processRequest('moms', 'user.transactions', $params);
     }
 
-    public function getopt(array $params = array()) 
+    public function getopt(array $params = array())
     {
         return $this->client->processRequest('moms', 'user.getopt', $params);
     }
 
-    public function info(array $params = array()) 
+    public function info(array $params = array())
     {
         return $this->client->processRequest('moms', 'user.info', $params);
     }
 
-    public function lookup(array $params = array()) 
+    public function lookup(array $params = array())
     {
         return $this->client->processRequest('moms', 'user.lookup', $params);
     }
 
-    public function uncache(array $params = array()) 
+    public function uncache(array $params = array())
     {
         return $this->client->processRequest('moms', 'user.uncache', $params);
     }
 }
-
-?>

lib/Utils.php

@@ -3,9 +3,15 @@
 class Mogreet_Utils
 {
 
-    public static function toCamelCase($str) 
+    public static function toCamelCase($str)
     {
-        return preg_replace('/_([a-z])/e', "strtoupper('\\1')", $str);
+        return preg_replace_callback(
+            '/_([a-z])/',
+            function ($matches) {
+                return strtoupper($matches[0]);
+            },
+            $str
+        );
     }
 
     public static function fromCamelCase($str)
@@ -42,5 +48,3 @@ public static function json_to_object($in)
         return $obj;
     }
 }
-
-?>