Moderised and bugs fixed

.gitignore

@@ -1,3 +1,5 @@
+/.idea
+/.history
 composer.phar
 composer.lock
 vendor
@@ -9,3 +11,4 @@ php-cs-fixer.phar
 .project
 .settings
 build
+/.phpunit.result.cache

.travis.yml

@@ -1,8 +1,11 @@
 language: php
 
 php:
-  - 5.3
-  - 5.4
+  - 7.4
+  - 8.0
+  - 8.1
+  - 8.2
+  - 8.3
 
 before_script:
   - composer self-update

composer.json

@@ -8,29 +8,53 @@
         {
             "name": "Tom Oram",
             "email": "[email protected]",
-            "homepage": "http://github.com/tomphp"
+            "homepage": "https://github.com/tomphp"
         },
         {
             "name": "Merlyn Cooper",
             "email": "[email protected]",
-            "homepage": "http://github.com/Merlyn-Cooper"
+            "homepage": "https://github.com/Merlyn-Cooper"
+        },
+        {
+            "name": "James Wade",
+            "email": "[email protected]",
+            "homepage": "https://github.com/jpswade"
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=7.4",
         "sclinternet/scl-contact": "dev-master",
         "sclinternet/scl-socket": "dev-master",
-        "sclinternet/scl-request-response": "dev-master"
+        "sclinternet/scl-request-response": "dev-master",
+        "ext-simplexml": "*",
+        "ext-xmlwriter": "*",
+        "ext-dom": "*"
     },
     "autoload": {
-        "psr-0": {
-            "SclNominetEpp\\": "src/"
+        "psr-4": {
+            "SclNominetEpp\\": "src/SclNominetEpp/"
         }
     },
     "require-dev": {
-        "phpunit/phpunit" : "3.7.*",
-        "squizlabs/php_codesniffer" : "1.*",
-        "phpmd/phpmd" : "1.4.0",
-        "satooshi/php-coveralls": "dev-master"
+        "phpunit/phpunit" : "8.*",
+        "squizlabs/php_codesniffer" : "3.*",
+        "phpmd/phpmd" : "2.*"
+    },
+    "scripts": {
+        "test": "phpunit",
+        "test-coverage": "phpunit --coverage-html coverage",
+        "cs": "phpcs --standard=phpcs.xml",
+        "cs-fix": "phpcbf --standard=phpcs.xml",
+        "cs-check": "phpcs --standard=phpcs.xml --report=summary",
+        "phpmd": "phpmd src text cleancode,codesize,controversial,design,naming,unusedcode",
+        "quality": [
+            "@cs-check",
+            "@phpmd",
+            "@test"
+        ],
+        "quality-fix": [
+            "@cs-fix",
+            "@test"
+        ]
     }
 }

phpcs.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<ruleset name="SclNominetEpp">
+    <description>Coding standard for SclNominetEpp library</description>
+
+    <!-- Include the entire src directory -->
+    <file>src</file>
+
+    <!-- Include the entire tests directory -->
+    <file>tests</file>
+
+    <!-- Exclude vendor directory -->
+    <exclude-pattern>vendor</exclude-pattern>
+
+    <!-- Exclude cache files -->
+    <exclude-pattern>*.cache</exclude-pattern>
+    <exclude-pattern>.phpunit.result.cache</exclude-pattern>
+
+    <!-- Use PSR-12 as the base standard -->
+    <rule ref="PSR12"/>
+
+    <!-- Additional rules for better code quality -->
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="120"/>
+            <property name="absoluteLineLimit" value="150"/>
+        </properties>
+    </rule>
+
+    <!-- Disable line length restrictions for test files -->
+    <rule ref="Generic.Files.LineLength">
+        <severity>0</severity>
+    </rule>
+
+    <!-- Enforce consistent naming -->
+    <rule ref="PSR1.Classes.ClassDeclaration"/>
+    <rule ref="PSR1.Methods.CamelCapsMethodName"/>
+
+    <!-- Documentation rules - practical approach for source files -->
+    <rule ref="Squiz.Commenting.FunctionComment">
+        <severity>5</severity>
+        <!-- Disable redundant @return tag when return type is already declared -->
+        <exclude name="Squiz.Commenting.FunctionComment.MissingReturn"/>
+        <!-- Disable parameter comment requirements when type hints are present -->
+        <exclude name="Squiz.Commenting.FunctionComment.MissingParamComment"/>
+        <!-- Allow shorter parameter descriptions -->
+        <exclude name="Squiz.Commenting.FunctionComment.ParamNameNoMatch"/>
+        <!-- Disable missing function comment requirement - too strict for all methods -->
+        <exclude name="Squiz.Commenting.FunctionComment.Missing"/>
+    </rule>
+
+    <!-- Class documentation - only require for public classes -->
+    <rule ref="Squiz.Commenting.ClassComment">
+        <severity>5</severity>
+        <!-- Only require for public classes -->
+        <exclude name="Squiz.Commenting.ClassComment.Missing"/>
+    </rule>
+
+    <!-- Disable all documentation requirements for test files -->
+    <rule ref="Squiz.Commenting.FunctionComment">
+        <severity>0</severity>
+    </rule>
+    <rule ref="Squiz.Commenting.ClassComment">
+        <severity>0</severity>
+    </rule>
+
+    <!-- Security rules -->
+    <rule ref="Generic.PHP.DeprecatedFunctions"/>
+    <rule ref="Generic.PHP.ForbiddenFunctions"/>
+
+    <!-- Code quality rules -->
+    <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
+    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
+    <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
+
+    <!-- Disable some overly strict rules -->
+    <rule ref="PSR12.Classes.ClassInstantiation">
+        <severity>0</severity>
+    </rule>
+
+    <!-- Allow short array syntax -->
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+
+    <!-- Show progress -->
+    <arg name="colors"/>
+
+    <!-- Generate reports -->
+    <arg value="sp"/>
+    <arg value="np"/>
+</ruleset>

phpunit.xml.dist → phpunit.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <phpunit
+        bootstrap="vendor/autoload.php"
         colors="true"
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
@@ -8,7 +9,6 @@
         stopOnFailure="false"
         processIsolation="false"
         backupGlobals="false"
-        syntaxCheck="true"
         >
     <testsuite name="UnitTests">
         <directory>./tests</directory>

src/SclNominetEpp/AbstractRequestResponse.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace SclNominetEpp;
+
+use SclRequestResponse\AbstractRequestResponse as BaseAbstractRequestResponse;
+use SclRequestResponse\RequestInterface;
+use SclRequestResponse\ResponseInterface;
+
+abstract class AbstractRequestResponse extends BaseAbstractRequestResponse
+{
+    /**
+     * The stored request object.
+     */
+    private RequestInterface $request;
+
+    /**
+     * Process a request and store it for later retrieval.
+     *
+     * @param RequestInterface $request The request to process.
+     * @return ResponseInterface The result of processing the request
+     */
+    public function processRequest(RequestInterface $request): ResponseInterface
+    {
+        $this->request = $request;
+        return parent::processRequest($request);
+    }
+
+    /**
+     * Get the currently stored request.
+     *
+     * @return RequestInterface The stored request
+     */
+    public function getRequest(): RequestInterface
+    {
+        return $this->request;
+    }
+}

src/SclNominetEpp/Address.php

@@ -3,14 +3,17 @@
 namespace SclNominetEpp;
 
 /**
- * DocBlock: Description of Address
- * @author Merlyn Cooper <[email protected]>
+ * Address class for handling address information.
  */
 class Address extends \SclContact\Address
 {
-
-
-    public function setLines(array $lines)
+    /**
+     * Set address lines from array.
+     *
+     * @param array $lines The address lines.
+     * @return void
+     */
+    public function setLines(array $lines): void
     {
         if (count($lines) === 3) {
             $this->setLine1($lines[0] . ', ' . $lines[1]);

src/SclNominetEpp/Communicator.php

@@ -1,20 +1,18 @@
 <?php
+
 /**
  * Contains the Communicator class definition.
- *
- * @author Tom Oram <[email protected]>
  */
 
 namespace SclNominetEpp;
 
+use SclRequestResponse\Exception\ConnectionFailedException;
 use SclSocket\SocketInterface;
 use SclRequestResponse\Communicator\PersistentCommunicator;
 
 /**
  * Sets up communication with the Nominet EPP server and sends requests and
  * processes the responses.
- *
- * @author Tom Oram
  */
 class Communicator extends PersistentCommunicator
 {
@@ -23,33 +21,34 @@ class Communicator extends PersistentCommunicator
      *
      * @var array
      */
-    public static $config = array(
-        'live' => array(
-            'secure' => array(
+    public static array $config = [
+        'live' => [
+            'secure' => [
                 'host' => 'epp.nominet.org.uk',
                 'port' => '700',
-            ),
-            'insecure' => array(
+            ],
+            'insecure' => [
                 'host' => 'epp.nominet.org.uk',
                 'port' => '8700',
-            ),
-        ),
-        'test' => array(
-            'secure' => array(
+            ],
+        ],
+        'test' => [
+            'secure' => [
                 'host' => 'testbed-epp.nominet.org.uk',
                 'port' => '700',
-            ),
-            'insecure' => array(
+            ],
+            'insecure' => [
                 'host' => 'testbed-epp.nominet.org.uk',
                 'port' => '8700',
-            ),
-        ),
-    );
+            ],
+        ],
+    ];
 
     /**
      * Constructor
      *
-     * @param SocketInterface $socket
+     * @param SocketInterface $socket The socket interface.
+     * @return void
      */
     public function __construct(SocketInterface $socket)
     {
@@ -59,12 +58,13 @@ public function __construct(SocketInterface $socket)
     /**
      * Connect to the server.
      *
-     * @param boolean $live
-     * @param boolean $secure
+     * @param boolean $live   Whether to use live or test environment.
+     * @param boolean $secure Whether to use secure connection.
      *
      * @return void
+     * @throws ConnectionFailedException When connection setup fails.
      */
-    public function setupConnection($live = false, $secure = true)
+    public function setupConnection(bool $live = false, bool $secure = true): void
     {
         $liveIndex = $live ? 'live' : 'test';
         $secureIndex = $secure ? 'secure' : 'insecure';
@@ -73,7 +73,9 @@ public function setupConnection($live = false, $secure = true)
 
         $this->connect($config['host'], $config['port'], $secure);
 
-        // TODO Parse and verify the greeting.
-        $this->read();
+        $response = $this->read();
+        if (empty($response)) {
+            throw new ConnectionFailedException('No greeting received from server.');
+        }
     }
 }