Refactor definition builders and remove cspray/typiphy

Author: cspray

annotated-container-definition.xsd

@@ -43,12 +43,9 @@
   <xs:complexType name="serviceDefinitionType">
     <xs:all>
       <xs:element name="type" type="fullyQualifiedClassNameString" />
-      <xs:element name="name" type="xs:token" />
-      <xs:element name="profiles" type="profilesType" />
-      <xs:element name="concreteOrAbstract" type="concreteOrAbstractType" />
       <xs:element name="attribute" type="base64EncodedString" />
     </xs:all>
-    <xs:attribute name="isPrimary" type="xs:boolean" default="false" />
+    <xs:attribute name="isConcrete" type="xs:boolean" />
   </xs:complexType>
 
   <xs:complexType name="aliasDefinitionsType">
@@ -104,32 +101,33 @@
       <xs:element name="class" type="fullyQualifiedClassNameString" />
       <xs:element name="method" type="classMethodString" />
       <xs:element name="parameter" type="classMethodParameterString" />
-      <xs:element name="valueType" type="base64EncodedString" />
-      <xs:element name="value" type="base64EncodedString" />
-      <xs:element name="profiles" type="profilesType" />
-      <xs:element name="store" type="xs:token" />
+      <xs:element name="valueType" type="injectValueType" />
       <xs:element name="attribute" type="base64EncodedString" />
     </xs:all>
   </xs:complexType>
 
-  <xs:complexType name="profilesType">
+  <xs:complexType name="injectValueType">
+    <xs:choice>
+      <xs:element name="type" type="xs:token" />
+      <xs:element name="typeUnion" type="typeUnionType" />
+      <xs:element name="typeIntersect" type="typeIntersectType" />
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name="typeIntersectType">
     <xs:sequence maxOccurs="unbounded">
-      <xs:element name="profile" type="profileString" />
+      <xs:element name="type" type="xs:token" />
     </xs:sequence>
   </xs:complexType>
 
-  <xs:simpleType name="profileString">
-    <xs:restriction base="xs:string">
-      <xs:minLength value="1" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="concreteOrAbstractType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Concrete" />
-      <xs:enumeration value="Abstract" />
-    </xs:restriction>
-  </xs:simpleType>
+  <xs:complexType name="typeUnionType">
+    <xs:sequence maxOccurs="unbounded">
+      <xs:choice>
+        <xs:element name="type" type="xs:token" />
+        <xs:element name="typeIntersect" type="typeIntersectType" />
+      </xs:choice>
+    </xs:sequence>
+  </xs:complexType>
 
   <xs:simpleType name="fullyQualifiedClassNameString">
     <xs:restriction base="xs:string">

composer.json

@@ -12,7 +12,7 @@
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.2",
     "ext-dom": "*",
     "ext-libxml": "*",
     "composer-runtime-api": "^2.2",
@@ -21,8 +21,7 @@
     "cspray/annotated-target": "^v2.0.0.alpha",
     "cspray/architectural-decision": "^3.0.0.alpha",
     "cspray/precision-stopwatch": "^0.2.0",
-    "cspray/typiphy": "^0.4",
-    "nikic/php-parser": "^4.19",
+    "nikic/php-parser": "^5.3",
     "psr/container": "^2.0"
   },
   "require-dev": {
@@ -40,7 +39,8 @@
     },
     "files": [
       "src/Function/auto-wired-parameters.php",
-      "src/Function/definitions.php"
+      "src/Function/definitions.php",
+      "src/Function/types.php"
     ]
   },
   "autoload-dev": {

docs/how-to/01-add-third-party-services.md

@@ -49,7 +49,7 @@ class ThirdPartyServicesProvider implements DefinitionProvider {
     public function consume(DefinitionProviderContext $context) : void {
         $context->addServiceDefinition(service($loggerType = objectType(LoggerInterface::class)));
         $context->addServiceDelegateDefinition(
-            serviceDelegate($loggerType, objectType(MonologLoggerFactory::class), 'createLogger')
+            serviceDelegate(objectType(MonologLoggerFactory::class), 'createLogger')
         );
         $context->addServicePrepareDefinition(
             servicePrepare(

docs/references/02-functional-api.md

@@ -23,7 +23,6 @@ This document lists the functions for each purpose.
 ) : \Cspray\AnnotatedContainer\Definition\AliasDefinition;
 
 \Cspray\AnnotatedContainer\serviceDelegate(
-    \Cspray\Typiphy\ObjectType $service,
     \Cspray\Typiphy\ObjectType $factoryClass,
     string $factoryMethod
 ) : \Cspray\AnnotatedContainer\Definition\ServiceDelegateDefinition;