dshovchko / php_EasyPay

src/Sign.php

Indentation +36 added lines, -36 removed lines

@@ -9,59 +9,59 @@
 
 class Sign
 {
-    public function __construct() {}
+        public function __construct() {}
 
-    /**
-     *      Verify signature of request
-     *
-     *      @param array $options
-     */
-    public function verify($request_str, $sign, $options)
-    {
+        /**
+         *      Verify signature of request
+         *
+         *      @param array $options
+         */
+        public function verify($request_str, $sign, $options)
+        {
         if (isset($options['UseSign']) && ($options['UseSign'] === true))
         {
-            $this->check_verify_sign_result(
+                $this->check_verify_sign_result(
                 $result = (new OpenSSL())->verify(
-                    str_replace($sign, '', $request_str),
-                    pack("H*", $sign),
-                    (new OpenSSL())->get_pub_key($this->get_pub_key($options))
+                        str_replace($sign, '', $request_str),
+                        pack("H*", $sign),
+                        (new OpenSSL())->get_pub_key($this->get_pub_key($options))
                 )
-            );
+                );
+        }
         }
-    }
 
-    /**
-     *      load file with easysoft public key
-     *
-     *      @param array $options
-     *      @throws Exception\Runtime
-     *      @return string
-     */
-    protected function get_pub_key($options)
-    {
+        /**
+         *      load file with easysoft public key
+         *
+         *      @param array $options
+         *      @throws Exception\Runtime
+         *      @return string
+         */
+        protected function get_pub_key($options)
+        {
         if ( ! isset($options['EasySoftPKey']))
         {
-            throw new Exception\Runtime('The parameter EasySoftPKey is not set!', -94);
+                throw new Exception\Runtime('The parameter EasySoftPKey is not set!', -94);
         }
 
         return (new Key())->get($options['EasySoftPKey'], 'public');
-    }
+        }
 
-    /**
-     *      check result of openssl verify signature
-     *
-     *      @param integer $result
-     *      @throws Exception\Sign
-     */
-    protected function check_verify_sign_result($result)
-    {
+        /**
+         *      check result of openssl verify signature
+         *
+         *      @param integer $result
+         *      @throws Exception\Sign
+         */
+        protected function check_verify_sign_result($result)
+        {
         if ($result == -1)
         {
-            throw new Exception\Sign('Error verify signature of request!', -96);
+                throw new Exception\Sign('Error verify signature of request!', -96);
         }
         elseif ($result == 0)
         {
-            throw new Exception\Sign('Signature of request is incorrect!', -95);
+                throw new Exception\Sign('Signature of request is incorrect!', -95);
+        }
         }
-    }
 }

Braces +1 added lines, -2 removed lines

@@ -58,8 +58,7 @@
         if ($result == -1)
         {
             throw new Exception\Sign('Error verify signature of request!', -96);
-        }
-        elseif ($result == 0)
+        } elseif ($result == 0)
         {
             throw new Exception\Sign('Signature of request is incorrect!', -95);
         }

src/Provider31/Request/General.php

Indentation +147 added lines, -147 removed lines

@@ -17,124 +17,124 @@ 
 
 class General
 {
-    /**
-     *      @var EasyPay\Provider31\Request\RAW raw request
-     */
-    protected $raw_request;
-
-    /**
-     *      @var string 'DateTime' node
-     */
-    protected $DateTime;
-
-    /**
-     *      @var string 'Sign' node
-     */
-    protected $Sign;
-
-    /**
-     *      @var string 'Operation' type
-     */
-    protected $Operation;
-
-    /**
-     *      @var string 'ServiceId' node
-     */
-    protected $ServiceId;
-
-    /**
-     *      @var array list of possible operations
-     */
-    protected $operations = array('Check','Payment','Confirm','Cancel');
-
-    /**
-     *      General constructor
-     *
-     *      @param EasyPay\Provider31\Request\RAW $raw Raw request data
-     */
-    public function __construct($raw)
-    {
+        /**
+         *      @var EasyPay\Provider31\Request\RAW raw request
+         */
+        protected $raw_request;
+
+        /**
+         *      @var string 'DateTime' node
+         */
+        protected $DateTime;
+
+        /**
+         *      @var string 'Sign' node
+         */
+        protected $Sign;
+
+        /**
+         *      @var string 'Operation' type
+         */
+        protected $Operation;
+
+        /**
+         *      @var string 'ServiceId' node
+         */
+        protected $ServiceId;
+
+        /**
+         *      @var array list of possible operations
+         */
+        protected $operations = array('Check','Payment','Confirm','Cancel');
+
+        /**
+         *      General constructor
+         *
+         *      @param EasyPay\Provider31\Request\RAW $raw Raw request data
+         */
+        public function __construct($raw)
+        {
         $this->raw_request = $raw;
 
         $this->parse_request_data();
-    }
-
-    /**
-     *      Get DateTime
-     *
-     *      @return string
-     */
-    public function DateTime()
-    {
+        }
+
+        /**
+         *      Get DateTime
+         *
+         *      @return string
+         */
+        public function DateTime()
+        {
         return $this->DateTime;
-    }
-
-    /**
-     *      Get Sign
-     *
-     *      @return string
-     */
-    public function Sign()
-    {
+        }
+
+        /**
+         *      Get Sign
+         *
+         *      @return string
+         */
+        public function Sign()
+        {
         return $this->Sign;
-    }
-
-    /**
-     *      Get Operation type
-     *
-     *      @return string
-     */
-    public function Operation()
-    {
+        }
+
+        /**
+         *      Get Operation type
+         *
+         *      @return string
+         */
+        public function Operation()
+        {
         return $this->Operation;
-    }
-
-    /**
-     *      Get ServiceId
-     *
-     *      @return string
-     */
-    public function ServiceId()
-    {
+        }
+
+        /**
+         *      Get ServiceId
+         *
+         *      @return string
+         */
+        public function ServiceId()
+        {
         return $this->ServiceId;
-    }
-
-    /**
-     *      Parse xml-request, which was previously "extracted" from the body of the http request
-     *
-     *      @throws Exception\Structure
-     */
-    protected function parse_request_data()
-    {
+        }
+
+        /**
+         *      Parse xml-request, which was previously "extracted" from the body of the http request
+         *
+         *      @throws Exception\Structure
+         */
+        protected function parse_request_data()
+        {
         // process <Request> group
         $r = $this->raw_request->get_nodes_from_request('Request');
 
         if (count($r) < 1)
         {
-            throw new Exception\Structure('The xml-query does not contain any element Request!', -52);
+                throw new Exception\Structure('The xml-query does not contain any element Request!', -52);
         }
 
         foreach ($r[0]->childNodes as $child)
         {
-            $this->check_and_parse_request_node($child, 'DateTime');
-            $this->check_and_parse_request_node($child, 'Sign');
+                $this->check_and_parse_request_node($child, 'DateTime');
+                $this->check_and_parse_request_node($child, 'Sign');
 
-            if (in_array($child->nodeName, $this->operations))
-            {
+                if (in_array($child->nodeName, $this->operations))
+                {
                 if ( ! isset($this->Operation))
                 {
-                    $this->Operation = $child->nodeName;
+                        $this->Operation = $child->nodeName;
                 }
                 else
                 {
-                    throw new Exception\Structure('There is more than one Operation type element in the xml-query!', -53);
+                        throw new Exception\Structure('There is more than one Operation type element in the xml-query!', -53);
+                }
                 }
-            }
         }
 
         if ( ! isset($this->Operation))
         {
-            throw new Exception\Structure('There is no Operation type element in the xml request!', -55);
+                throw new Exception\Structure('There is no Operation type element in the xml request!', -55);
         }
 
         // process <Operation> group
@@ -142,53 +142,53 @@ 
 
         foreach ($r[0]->childNodes as $child)
         {
-            $this->check_and_parse_request_node($child, 'ServiceId');
+                $this->check_and_parse_request_node($child, 'ServiceId');
+        }
         }
-    }
 
-    /**
-     *      Check if present node of request and then parse it
-     *
-     *      @param \DOMNode $n
-     *      @param string $name
-     */
-    protected function check_and_parse_request_node($n, $name)
-    {
+        /**
+         *      Check if present node of request and then parse it
+         *
+         *      @param \DOMNode $n
+         *      @param string $name
+         */
+        protected function check_and_parse_request_node($n, $name)
+        {
         if ($n->nodeName == $name)
         {
-            $this->parse_request_node($n, $name);
+                $this->parse_request_node($n, $name);
+        }
         }
-    }
 
-    /**
-     *      Parse node of request
-     *
-     *      @param \DOMNode $n
-     *      @param string $name
-     *
-     *      @throws Exception\Structure
-     */
-    protected function parse_request_node($n, $name)
-    {
+        /**
+         *      Parse node of request
+         *
+         *      @param \DOMNode $n
+         *      @param string $name
+         *
+         *      @throws Exception\Structure
+         */
+        protected function parse_request_node($n, $name)
+        {
         if ( ! isset($this->$name))
         {
-            $this->$name = $n->nodeValue;
+                $this->$name = $n->nodeValue;
         }
         else
         {
-            throw new Exception\Structure('There is more than one '.$name.' element in the xml-query!', -56);
+                throw new Exception\Structure('There is more than one '.$name.' element in the xml-query!', -56);
+        }
         }
-    }
 
-    /**
-     *      "Rough" validation of the received xml request
-     *
-     *      @param array $options
-     *      @throws Exception\Data
-     *      @throws Exception\Structure
-     */
-    public function validate_request($options)
-    {
+        /**
+         *      "Rough" validation of the received xml request
+         *
+         *      @param array $options
+         *      @throws Exception\Data
+         *      @throws Exception\Structure
+         */
+        public function validate_request($options)
+        {
         $this->validate_element('DateTime');
         $this->validate_element('Sign');
         $this->validate_element('ServiceId');
@@ -196,36 +196,36 @@ 
         // compare received value ServiceId with option ServiceId
         if (intval($options['ServiceId']) != intval($this->ServiceId))
         {
-            throw new Exception\Data('This request is not for our ServiceId!', -58);
+                throw new Exception\Data('This request is not for our ServiceId!', -58);
+        }
         }
-    }
 
-    /**
-     *      Validation of xml-element
-     *
-     *      @param string $name
-     */
-    public function validate_element($name)
-    {
+        /**
+         *      Validation of xml-element
+         *
+         *      @param string $name
+         */
+        public function validate_element($name)
+        {
         if ( ! isset($this->$name))
         {
-            throw new Exception\Structure('There is no '.$name.' element in the xml request!', -57);
+                throw new Exception\Structure('There is no '.$name.' element in the xml request!', -57);
+        }
         }
-    }
 
-    /**
-     *      Verify signature of request
-     *
-     *      @param array $options
-     */
-    public function verify_sign($options)
-    {
+        /**
+         *      Verify signature of request
+         *
+         *      @param array $options
+         */
+        public function verify_sign($options)
+        {
         $sign = new \EasyPay\Sign();
         $sign->verify(
-            $this->raw_request->str(),
-            $this->Sign,
-            $options
+                $this->raw_request->str(),
+                $this->Sign,
+                $options
         );
-    }
+        }
 
 }

Braces +2 added lines, -4 removed lines

@@ -124,8 +124,7 @@ 
                 if ( ! isset($this->Operation))
                 {
                     $this->Operation = $child->nodeName;
-                }
-                else
+                } else
                 {
                     throw new Exception\Structure('There is more than one Operation type element in the xml-query!', -53);
                 }
@@ -173,8 +172,7 @@ 
         if ( ! isset($this->$name))
         {
             $this->$name = $n->nodeValue;
-        }
-        else
+        } else
         {
             throw new Exception\Structure('There is more than one '.$name.' element in the xml-query!', -56);
         }