Merge pull request #2 from Mastercard/feature/fixing-code-smells

Fixing code smells

Author: danny-gallagher

src/Developer/Encryption/FieldLevelEncryption.php

@@ -12,8 +12,6 @@
  */
 class FieldLevelEncryption {
 
-    private function __construct() {}
-
     /**
      * Encrypt parts of a JSON payload using the given parameters and configuration.
      * @param $payload A JSON string
@@ -196,7 +194,7 @@ private static function addDecryptedDataToPayload($payloadJsonObject, $jsonPathO
             $outJsonObject->$key = $value;
         }
     }
-    
+
     private static function readJsonElement($payloadJsonObject, $jsonPath) {
         return JsonPath::find($payloadJsonObject, $jsonPath);
     }
@@ -278,4 +276,4 @@ private static function sanitizeJson($json) {
         $json = str_replace("\t", '', $json);
         return str_replace("\r\n", '', $json);
     }
-}
+}

src/Developer/Encryption/FieldLevelEncryptionConfigBuilder.php

@@ -33,8 +33,6 @@ class FieldLevelEncryptionConfigBuilder {
     private $encryptionKeyFingerprintHeaderName;
     private $fieldValueEncoding;
 
-    private function __construct() {}
-
     /**
      * Get an instance of the builder.
      */
@@ -318,4 +316,4 @@ private function computeEncryptionKeyFingerprintWhenNeeded() {
             throw new EncryptionException('Failed to compute encryption key fingerprint!', $e);
         }
     }
-}
+}

src/Developer/Interceptors/PsrStreamInterfaceImpl.php

@@ -40,7 +40,9 @@ public function seek($offset, $whence = SEEK_SET) {
         return null;
     }
 
-    public function rewind() {}
+    public function rewind() {
+        return null;
+    }
 
     public function isWritable() {
         return false;
@@ -65,4 +67,4 @@ public function getContents() {
     public function getMetadata($key = null) {
         return [];
     }
-}
+}

src/Developer/Json/JsonPath.php

@@ -16,8 +16,6 @@ class JsonPath {
     const FIRST_CHILD_KEY = "/(?:\[')([^\[\]]*)(?:'\])/"; // Returns "obj1" for "$['obj1']['obj2']"
     const FIRST_TOKEN_IN_PATH = "/(\['[^\[\]]*'\])/";     // Returns "['obj1']" for "$['obj1']['obj2']"
 
-    private function __construct() {}
-
     /**
      * Convert the given JSON path to the following form: $['path']['to']['object'].
      * @throws \InvalidArgumentException
@@ -55,7 +53,7 @@ static function find($jsonObject, $path) {
         $currentElement = $jsonObject;
         while ($currentPath !== '$') {
             preg_match(self::FIRST_CHILD_KEY, $currentPath, $matches);
-            if (sizeof($matches) <= 0) {
+            if (sizeof($matches).isEmpty()) {
                 return null;
             }
             $childKey = $matches[1];
@@ -121,7 +119,7 @@ static function getElementKey($path) {
 
         throw new \InvalidArgumentException('Unsupported JSON path: ' . $path . '!');
     }
-        
+
     /**
      * Checks if a JSON path points to a single item or if it potentially returns multiple items.
      * @link https://github.com/json-path/JsonPath
@@ -130,4 +128,4 @@ static function isPathDefinite($path) {
         return strpos($path, '*') === false && strpos($path, '..') === false
             && strpos($path, '@') === false && strpos($path, ',') === false;
     }
-}
+}

src/Developer/Utils/EncodingUtils.php

@@ -5,8 +5,6 @@
 
 class EncodingUtils {
 
-    private function __construct() {}
-
     static function encodeBytes($bytes, $encoding) {
         return $encoding === FieldValueEncoding::HEX ? self::hexEncode($bytes) : base64_encode($bytes);
     }
@@ -47,4 +45,4 @@ static function pemToDer($pem, $header, $footer) {
         $der = str_replace($footer, '', $der);
         return base64_decode($der);
     }
-}
+}

src/Developer/Utils/EncryptionUtils.php

@@ -14,8 +14,6 @@ class EncryptionUtils {
     const PKCS_8_PEM_HEADER = '-----BEGIN PRIVATE KEY-----';
     const PKCS_8_PEM_FOOTER = '-----END PRIVATE KEY-----';
 
-    private function __construct() {}
-
     /**
      * Create an X.509 resource from the certificate data at the given file path.
      * @throws \InvalidArgumentException

tests/Developer/Encryption/FieldLevelEncryptionTest.php

@@ -1267,4 +1267,4 @@ public function testDecryptPayload_ShouldThrowInvalidArgumentException_WhenEncry
         // WHEN
         FieldLevelEncryption::decryptPayload($encryptedPayload, $config, null);
     }
-}
+}

tests/Developer/Interceptors/PsrStreamInterfaceImplTest.php

@@ -46,7 +46,7 @@ public function testSeek() {
     }
 
     public function testRewind() {
-        $this->instanceUnderTest->rewind();
+        $this->assertNull($this->instanceUnderTest->rewind());
     }
 
     public function testIsWritable() {
@@ -74,4 +74,4 @@ public function testGetContents() {
     public function testGetMetadata() {
         $this->assertEquals([], $this->instanceUnderTest->getMetadata());
     }
-}
+}