Error handling

Author: veewee

README.md

@@ -28,7 +28,7 @@ use Soap\Engine\Metadata\Model\Method;
 use Soap\Engine\Metadata\Model\Type;
 use Soap\Wsdl\Loader\FlatteningLoader;
 use Soap\Wsdl\Loader\StreamWrapperLoader;
-use Soap\WsdlReader\Formatter\MethodFormatter;
+use Soap\WsdlReader\Formatter\ShortMethodFormatter;
 use Soap\WsdlReader\Formatter\ShortTypeFormatter;
 use Soap\WsdlReader\Metadata\Wsdl1MetadataProvider;
 use Soap\WsdlReader\Wsdl1Reader;
@@ -42,7 +42,7 @@ $metadata = $metadataProvider->getMetadata();
 echo PHP_EOL;
 
 echo "Methods:".PHP_EOL;
-echo implode(PHP_EOL, $metadata->getMethods()->map(fn (Method $method) => '  > '.(new MethodFormatter())($method)));
+echo implode(PHP_EOL, $metadata->getMethods()->map(fn (Method $method) => '  > '.(new ShortMethodFormatter())($method)));
 echo PHP_EOL.PHP_EOL;
 
 echo "Types:".PHP_EOL;

bin/tmp/compare.php

@@ -8,7 +8,7 @@
 use Soap\ExtSoapEngine\ExtSoapOptions;
 use Soap\Wsdl\Loader\FlatteningLoader;
 use Soap\Wsdl\Loader\StreamWrapperLoader;
-use Soap\WsdlReader\Formatter\MethodFormatter;
+use Soap\WsdlReader\Formatter\ShortMethodFormatter;
 use Soap\WsdlReader\Formatter\ShortTypeFormatter;
 use Soap\WsdlReader\Metadata\Wsdl1MetadataProvider;
 use Soap\WsdlReader\Wsdl1Reader;

src/Console/Command/InspectCommand.php

@@ -6,7 +6,7 @@
 use Soap\Engine\Metadata\Model\Method;
 use Soap\Engine\Metadata\Model\Type;
 use Soap\Wsdl\Console\Helper\ConfiguredLoader;
-use Soap\WsdlReader\Formatter\MethodFormatter;
+use Soap\WsdlReader\Formatter\ShortMethodFormatter;
 use Soap\WsdlReader\Formatter\ShortTypeFormatter;
 use Soap\WsdlReader\Metadata\Wsdl1MetadataProvider;
 use Soap\WsdlReader\Wsdl1Reader;
@@ -48,7 +48,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $metadata = $metadataProvider->getMetadata();
 
         $style->info('Methods:');
-        $style->writeln($metadata->getMethods()->map(fn (Method $method) => '  > '.(new MethodFormatter())($method)));
+        $style->writeln($metadata->getMethods()->map(fn (Method $method) => '  > '.(new ShortMethodFormatter())($method)));
 
         $style->info('Types:');
         $style->writeln($metadata->getTypes()->map(fn (Type $type) => '  > '.(new ShortTypeFormatter())($type)));

src/Console/Command/InspectMethodCommand.php

@@ -6,7 +6,8 @@
 use Soap\Engine\Metadata\Model\Method;
 use Soap\Engine\Metadata\Model\Parameter;
 use Soap\Wsdl\Console\Helper\ConfiguredLoader;
-use Soap\WsdlReader\Formatter\MethodFormatter;
+use Soap\WsdlReader\Formatter\LongMethodFormatter;
+use Soap\WsdlReader\Formatter\ShortMethodFormatter;
 use Soap\WsdlReader\Metadata\Wsdl1MetadataProvider;
 use Soap\WsdlReader\Wsdl1Reader;
 use Symfony\Component\Console\Command\Command;
@@ -49,13 +50,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $wsdl = (new Wsdl1Reader($loader))($wsdl);
         $metadataProvider = new Wsdl1MetadataProvider($wsdl);
         $metadata = $metadataProvider->getMetadata();
+
         $detectedMethods = filter($metadata->getMethods(), fn (Method $methodInfo): bool => $methodInfo->getName() === $method);
+        if (!$detectedMethods) {
+            $style->error('Unable to find method '.$method);
+            return self::FAILURE;
+        }
 
         $style->info('Methods:');
         $style->writeln(
             map(
                 $detectedMethods,
-                fn (Method $method) => '  > '.(new MethodFormatter())($method)
+                fn (Method $method) => '  > '.(new LongMethodFormatter())($method)
             )
         );
 

src/Console/Command/InspectTypeCommand.php

@@ -3,12 +3,9 @@
 
 namespace Soap\WsdlReader\Console\Command;
 
-use Soap\Engine\Metadata\Model\Method;
 use Soap\Engine\Metadata\Model\Type;
 use Soap\Wsdl\Console\Helper\ConfiguredLoader;
 use Soap\WsdlReader\Formatter\LongTypeFormatter;
-use Soap\WsdlReader\Formatter\MethodFormatter;
-use Soap\WsdlReader\Formatter\ShortTypeFormatter;
 use Soap\WsdlReader\Metadata\Wsdl1MetadataProvider;
 use Soap\WsdlReader\Wsdl1Reader;
 use Symfony\Component\Console\Command\Command;
@@ -50,10 +47,14 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $metadataProvider = new Wsdl1MetadataProvider($wsdl);
         $metadata = $metadataProvider->getMetadata();
 
+        $detectedTypes = $metadata->getTypes()->filter(fn (Type $type): bool => $type->getName() === $typeName);
+        if (!$detectedTypes->count()) {
+            $style->error('Unable to find type '.$typeName);
+            return self::FAILURE;
+        }
+
         $style->writeln(
-            $metadata->getTypes()
-                ->filter(fn (Type $type): bool => $type->getName() === $typeName)
-                ->map(fn (Type $type) => '  > '.(new LongTypeFormatter())($type))
+            $detectedTypes->map(fn (Type $type) => '  > '.(new LongTypeFormatter())($type))
         );
 
         return self::SUCCESS;

src/Formatter/MethodFormatter.php renamed to src/Formatter/LongMethodFormatter.php

@@ -7,7 +7,7 @@
 use Soap\Engine\Metadata\Model\Parameter;
 use function Psl\Str\format;
 
-class MethodFormatter
+class LongMethodFormatter
 {
     private XsdTypeFormatter $xsdTypeFormatter;
 

src/Formatter/ShortMethodFormatter.php

@@ -0,0 +1,37 @@
+<?php
+declare(strict_types=1);
+
+namespace Soap\WsdlReader\Formatter;
+
+use Soap\Engine\Metadata\Model\Method;
+use Soap\Engine\Metadata\Model\Parameter;
+use function Psl\Str\format;
+
+class ShortMethodFormatter
+{
+    private XsdTypeFormatter $xsdTypeFormatter;
+
+    public function __construct()
+    {
+        $this->xsdTypeFormatter = new XsdTypeFormatter();
+    }
+
+    /**
+     * TODO : level depth for types?
+     */
+    public function __invoke(Method $method, int $level=1): string
+    {
+        return format(
+            '%s(%s): %s',
+            $method->getName(),
+            implode(', ', $method->getParameters()->map(
+                fn (Parameter $parameter): string => format(
+                    '%s $%s',
+                    ($this->xsdTypeFormatter)($parameter->getType()),
+                    $parameter->getName()
+                )
+            )),
+            ($this->xsdTypeFormatter)($method->getReturnType()),
+        );
+    }
+}

tests/PhpCompatibility/test_schema.inc

@@ -4,7 +4,7 @@ use Soap\Engine\Metadata\Model\Method;
 use Soap\Engine\Metadata\Model\Type;
 use Soap\Wsdl\Loader\CallbackLoader;
 use Soap\WsdlReader\Formatter\LongTypeFormatter;
-use Soap\WsdlReader\Formatter\MethodFormatter;
+use Soap\WsdlReader\Formatter\ShortMethodFormatter;
 use Soap\WsdlReader\Formatter\ShortTypeFormatter;
 use Soap\WsdlReader\Metadata\Wsdl1MetadataProvider;
 use Soap\WsdlReader\Wsdl1Reader;
@@ -63,7 +63,7 @@ function test_schema($schema, $type, $style="rpc",$use="encoded", $attributeForm
       $metadata = $metadataProvider->getMetadata();
 
       echo "Methods:" . PHP_EOL;
-      echo implode(PHP_EOL, $metadata->getMethods()->map(fn(Method $method) => '  > ' . (new MethodFormatter())($method)));
+      echo implode(PHP_EOL, $metadata->getMethods()->map(fn(Method $method) => '  > ' . (new ShortMethodFormatter())($method)));
       echo PHP_EOL . PHP_EOL;
 
       echo "Types:" . PHP_EOL;