Skip to content

Commit

Permalink
Task/remove psr log (#355)
Browse files Browse the repository at this point in the history
* Begin emitting events to replace logging

* Remove remaining configuration references

* Finish replacing logging with event system
  • Loading branch information
cspray authored Mar 4, 2024
1 parent 2d85f54 commit 66e0603
Show file tree
Hide file tree
Showing 146 changed files with 1,321 additions and 5,602 deletions.
15 changes: 0 additions & 15 deletions annotated-container-definition.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<xs:all>
<xs:element name="serviceDefinitions" type="serviceDefinitionsType" />
<xs:element name="aliasDefinitions" type="aliasDefinitionsType" />
<xs:element name="configurationDefinitions" type="configurationDefinitionsType" />
<xs:element name="servicePrepareDefinitions" type="servicePrepareDefinitionsType" />
<xs:element name="serviceDelegateDefinitions" type="serviceDelegateDefinitionsType" />
<xs:element name="injectDefinitions" type="injectDefinitionsType" />
Expand Down Expand Up @@ -65,20 +64,6 @@
</xs:all>
</xs:complexType>

<xs:complexType name="configurationDefinitionsType">
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="configurationDefinition" type="configurationDefinitionType" />
</xs:sequence>
</xs:complexType>

<xs:complexType name="configurationDefinitionType">
<xs:all>
<xs:element name="type" type="xs:token" />
<xs:element name="name" type="xs:token" />
<xs:element name="attribute" type="xs:string" />
</xs:all>
</xs:complexType>

<xs:complexType name="servicePrepareDefinitionsType">
<xs:sequence minOccurs="0" maxOccurs="unbounded">
<xs:element name="servicePrepareDefinition" type="servicePrepareDefinitionType" />
Expand Down
21 changes: 0 additions & 21 deletions annotated-container.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<xs:element name="definitionProviders" type="definitionProvidersType" minOccurs="0" maxOccurs="1" />
<xs:element name="parameterStores" type="parameterStoresType" minOccurs="0" maxOccurs="1" />
<xs:element name="observers" type="observersType" minOccurs="0" maxOccurs="1" />
<xs:element name="logging" type="loggingType" minOccurs="0" maxOccurs="1" />
</xs:all>
</xs:complexType>

Expand Down Expand Up @@ -88,24 +87,4 @@
</xs:sequence>
</xs:complexType>

<xs:complexType name="loggingType">
<xs:all>
<xs:element name="file" type="xs:token" minOccurs="0" maxOccurs="1" />
<xs:element name="stdout" type="stdoutType" minOccurs="0" maxOccurs="1" />
<xs:element name="exclude" type="excludeType" minOccurs="0" maxOccurs="1" />
</xs:all>
</xs:complexType>

<xs:complexType name="stdoutType">
<xs:simpleContent>
<xs:extension base="xs:string" />
</xs:simpleContent>
</xs:complexType>

<xs:complexType name="excludeType">
<xs:sequence>
<xs:element name="profile" type="xs:token" minOccurs="1" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>

</xs:schema>
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
"composer-runtime-api": "^2",
"brick/varexporter": "^0.3.7",
"cspray/annotated-container-adr": "^2",
"cspray/annotated-container-attribute": "^1.1",
"cspray/annotated-container-attribute": "^2.0.0-alpha.1",
"cspray/annotated-target": "^v0.3",
"cspray/precision-stopwatch": "^0.2.0",
"cspray/typiphy": "^0.3",
"nikic/php-parser": "^4.10",
"ocramius/package-versions": "^2.7",
"psr/container": "^2.0",
"psr/log": "^2 || ^3"
"psr/container": "^2.0"
},
"require-dev": {
"cspray/phinal": "^1.0",
Expand All @@ -35,7 +34,8 @@
"rdlowrey/auryn": "^1.4",
"roave/security-advisories": "dev-latest",
"vimeo/psalm": "^4.24",
"illuminate/container": "^10.11"
"illuminate/container": "^10.11",
"psr/log": "^3.0"
},
"bin": ["bin/annotated-container"],
"autoload": {
Expand Down
Loading

0 comments on commit 66e0603

Please sign in to comment.