PSR4

.gitignore

@@ -1 +1,3 @@
 .idea/
+
+/vendor/

README.md

@@ -26,7 +26,7 @@ $ipsp   = new Ipsp_Api( $client );
 <?php
 function getSignature( $merchant_id , $password , $params = array() ){
  $params['merchant_id'] = $merchant_id;
- $params = array_filter($params);
+ $params = array_filter($params,'strlen');
  ksort($params);
  $params = array_values($params);
  array_unshift( $params , $password );

composer.json

@@ -0,0 +1,15 @@
+{
+    "name": "cloudipsp/ipsp",
+    "description": "Payment service provider",
+    "type": "library",
+    "require": {
+        "php":">=5.4",
+        "ext-simplexml":"*",
+        "ext-curl": "*"
+    },
+    "autoload": {
+        "psr-4": {
+            "Ipsp\\": "src/"
+        }
+    }
+}

init.example.php

@@ -1,7 +1,10 @@
 <?php
-require_once 'ipsp-php/autoload.php';
+use Ipsp\Api;
+use Ipsp\Client;
+
 define('MERCHANT_ID' , 1000);
 define('MERCHANT_PASSWORD' , 'test');
 define('IPSP_GATEWAY' ,  'api.fondy.eu');
-$client = new Ipsp_Client( MERCHANT_ID , MERCHANT_PASSWORD, IPSP_GATEWAY );
-$ipsp   = new Ipsp_Api( $client );
+
+$client = new Client( MERCHANT_ID , MERCHANT_PASSWORD, IPSP_GATEWAY );
+$ipsp   = new Api( $client );

Ipsp/Api.php → src/Api.php

@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
- * Class Ipsp_Api
+ * Class Api
  */
-class Ipsp_Api {
+class Api {
 
     private $client;
     private $params = array();
@@ -16,9 +18,9 @@ class Ipsp_Api {
     const RUB = 'RUB';
     const GBP = 'GBP';    
     /**
-     * @param Ipsp_Client $client
+     * @param Client $client
      */
-    public function __construct( Ipsp_Client $client ){
+    public function __construct( Client $client ){
         $this->client   = $client;
         set_error_handler(array($this, 'handleError'));
         set_exception_handler(array($this, 'handleException'));
@@ -28,10 +30,10 @@ public function __construct( Ipsp_Client $client ){
      * @return bool
      */
     public function initResource($name){
-        $class    = implode('_',array('Ipsp','Resource',ucfirst($name)));
-        if(!class_exists($class)) new \Exception(sprintf('ipsp resource "%s" not found',$class));
-        $resource = new $class;
-        return $resource;
+        $class    = '\Ipsp\Resources\\' . ucfirst($name);
+        if(!class_exists($class))
+            new \Exception(sprintf('"%s" not found',$class));
+        return new $class;
     }
     /**
      * @param null $name
@@ -91,4 +93,4 @@ public function handleException(\Exception $e) {
        );
        exit($msg);
     }
-}
+}

Ipsp/Client.php → src/Client.php

@@ -1,8 +1,11 @@
 <?php
+
+namespace Ipsp;
+
 /**
  * Class PaymentClient
  */
-class Ipsp_Client {
+class Client {
     private $id;
     private $password;
     private $url;

Ipsp/Curl.php → src/Curl.php

@@ -1,9 +1,11 @@
-<?
+<?php
+
+namespace Ipsp;
 
 /**
- * Class Ipsp_Curl
+ * Class Curl
  */
-class Ipsp_Curl {
+class Curl {
     protected $response = '';       // Contains the cURL response for debug
     protected $session;             // Contains the cURL handler for a session
     protected $url;                 // URL of the session

src/Error.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Ipsp;
+
+    class Error extends \Exception{
+
+
+    }

Ipsp/Request.php → src/Request.php

@@ -1,9 +1,11 @@
 <?php
 
+namespace Ipsp;
+
 /**
- * Class Ipsp_Request
+ * Class Request
  */
-class Ipsp_Request {
+class Request {
     private $curl;
     private $format;
     private $contentType = array(
@@ -15,7 +17,7 @@ class Ipsp_Request {
      *
      */
     public function __construct(){
-        $this->curl = new Ipsp_Curl;
+        $this->curl = new Curl;
     }
     /**
      * @param $format

Ipsp/Resource.php → src/Resource.php

@@ -1,8 +1,11 @@
 <?php
+
+namespace Ipsp;
+
 /**
- * Class Ipsp_Resource
+ * Class Resource
  */
-class Ipsp_Resource {
+class Resource {
     protected $method = 'POST';
     protected $format = 'json';
     protected $path;
@@ -30,7 +33,7 @@ class Ipsp_Resource {
      * @return string
      */
     private function getSignature(Array $params){
-        $params = array_filter($params);
+        $params = array_filter($params,'strlen');
         ksort($params);
         $params = array_values($params);
         array_unshift( $params , $this->client->getPassword() );
@@ -51,7 +54,7 @@ private function parseJson($json=''){
      * @return array
      */
     private function parseXml($xml=''){
-        $xml = new Ipsp_XmlData($xml);
+        $xml = new XmlData($xml);
         $data = $xml->xmlToArray();
         return $data;
     }
@@ -99,7 +102,7 @@ private function formParams($params=array()){
      * @return mixed
      */
     private function xmlParams($params=array()){
-        $xml = new Ipsp_XmlData('<request/>');
+        $xml = new XmlData('<request/>');
         $xml->arrayToXml($params);
         return $xml->asXML();
     }
@@ -118,14 +121,14 @@ protected function buildParams($params){
         }
     }
     public function __construct(){
-        $this->request  = new Ipsp_Request();
+        $this->request  = new Request();
         if(!empty($this->defaultParams))
             $this->params = $this->defaultParams;
     }
     /**
-     * @param Ipsp_Client $client
+     * @param Client $client
      */
-    public function setClient(Ipsp_Client $client){
+    public function setClient(Client $client){
         $this->client = $client;
     }
     /**
@@ -200,7 +203,7 @@ public function call( $params=array() ){
      * @param array $data
      */
     public function setResponse($data=array()){
-        $this->response = new Ipsp_Response($data);
+        $this->response = new Response($data);
     }
     /**
      * @return array

Ipsp/Resource/Capture.php → src/Resource/Capture.php

@@ -1,9 +1,14 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_PaymentResult
+ * Class PaymentResult
  */
-class Ipsp_Resource_Capture extends Ipsp_Resource{
+class Capture extends Resource
+{
     protected $path   = '/capture/order_id';
     protected $fields = array(
         'merchant_id'=>array(

Ipsp/Resource/Checkout.php → src/Resource/Checkout.php

@@ -1,9 +1,14 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_PaymentUrl
+ * Class PaymentUrl
  */
-class Ipsp_Resource_Checkout extends Ipsp_Resource{
+class Checkout extends Resource
+{
     protected $path   = '/checkout/url';
     protected $fields = array(
         'merchant_id'=>array(

Ipsp/Resource/P2pcredit.php → src/Resource/P2pcredit.php

@@ -1,9 +1,13 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_P2pcredit extends Ipsp_Resource{
+class P2pcredit extends Resource {
     protected $path   = '/p2pcredit';
     protected $defaultParams = array(
 

Ipsp/Resource/Pcidss.php → src/Resource/Pcidss.php

@@ -1,9 +1,13 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_PaymentPcidss
+ * Class PaymentPcidss
  */
-class Ipsp_Resource_Pcidss extends Ipsp_Resource
+class Pcidss extends Resource
 {
     protected $path = '/3dsecure_step1';
     protected $fields = array(

Ipsp/Resource/PcidssConfirm.php → src/Resource/PcidssConfirm.php

@@ -1,9 +1,13 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_PaymentPcidss
+ * Class PaymentPcidss
  */
-class Ipsp_Resource_PcidssConfirm extends Ipsp_Resource
+class PcidssConfirm extends Resource
 {
     protected $path = '/3dsecure_step2';
     protected $fields = array(

Ipsp/Resource/Recurring.php → src/Resource/Recurring.php

@@ -1,9 +1,13 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_Recurring extends Ipsp_Resource{
+class Recurring extends Resource{
     protected $path   = '/recurring';
     protected $defaultParams = array(
 

Ipsp/Resource/Reports.php → src/Resource/Reports.php

@@ -1,9 +1,13 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_Reports extends Ipsp_Resource{
+class Reports extends Resource{
     protected $path   = '/reports';
     protected $fields = array(
         'merchant_id'=>array(

Ipsp/Resource/Result.php → src/Resource/Result.php

@@ -1,9 +1,14 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_PaymentResult
+ * Class PaymentResult
  */
-class Ipsp_Resource_Result extends Ipsp_Resource{
+class Result extends Resource
+{
     public function call( $data = NULL ){
         if( empty( $data ) )
         {

Ipsp/Resource/Reverse.php → src/Resource/Reverse.php

@@ -1,10 +1,14 @@
-<?
+<?php
+
+namespace Ipsp\Resource;
+
+use Ipsp\Resource;
 
 /**
- * Class Ipsp_Resource_Refund
+ * Class Refund
  */
-class Ipsp_Resource_Reverse extends Ipsp_Resource{
-
+class Reverse extends Resource
+{
     protected $path   = '/reverse/order_id';
 
     protected $fields = array(