Skip to content

Commit ec61331

Browse files
santiagolizardosantiagolizardo
committed
Integrate with command parser library
1 parent 9a00042 commit ec61331

File tree

78 files changed

+67267
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+67267
-56
lines changed

‎Makefile

+13-3
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ else
2121
GIT_BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD)
2222
endif
2323

24+
define composer_install
25+
echo
26+
echo Running composer install on $(1)
27+
docker-compose run --rm --user reconmapper -w $(1) --entrypoint composer api install
28+
endef
29+
2430
.PHONY: prepare-config
2531
prepare-config:
2632
[ -f config.json ] || cp config-template.json config.json
@@ -29,9 +35,14 @@ prepare-config:
2935
prepare-dirs:
3036
mkdir -p vendor logs data-mysql data-redis
3137

38+
.SILENT: install-deps
39+
.PHONY: install-deps
40+
install-deps:
41+
$(call composer_install, /var/www/webapp)
42+
$(call composer_install, /var/www/webapp/packages/command-parsers-lib)
43+
3244
.PHONY: prepare
33-
prepare: prepare-config prepare-dirs build
34-
docker-compose run --rm --user reconmapper -w /var/www/webapp --entrypoint composer api install
45+
prepare: prepare-config prepare-dirs build install-deps
3546

3647
.PHONY: build
3748
build:
@@ -40,7 +51,6 @@ build:
4051
.PHONY: tests
4152
tests: start validate
4253
docker-compose run --rm -e WAIT_HOSTS=$(DB_CONTAINER):3306 -e WAIT_TIMEOUT=60 --entrypoint /usr/local/bin/wait waiter
43-
4454
echo Importing SQL files: $(wildcard database/0*.sql)
4555
cat tests/database.sql | docker container exec -i $(DB_CONTAINER) mysql -uroot -preconmuppet
4656
cat database/0*.sql | sed "s/USE reconmap;/USE reconmap_test;/" | docker container exec -i $(DB_CONTAINER) mysql -uroot -preconmuppet reconmap_test

‎composer.json

+8-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"php": "^8.3",
3131
"phpoffice/phpword": "^1.0",
3232
"ponup/sql-builders": "^1.0",
33-
"reconmap/command-output-parsers": "^2.0",
33+
"reconmap/command-parsers": "^2.0",
3434
"symfony/config": "^7.1",
3535
"symfony/console": "^7",
3636
"symfony/dependency-injection": "^7.1",
@@ -55,5 +55,11 @@
5555
"psr-4": {
5656
"Reconmap\\": "tests/"
5757
}
58-
}
58+
},
59+
"repositories": [
60+
{
61+
"type": "path",
62+
"url": "packages/command-parsers-lib"
63+
}
64+
]
5965
}

‎composer.lock

+28-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docker-compose.yml

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ services:
7474
- "./docs/openapi.yaml:/var/www/webapp/public/docs/openapi.yaml"
7575
- "./docs/schemas/:/var/www/webapp/public/docs/schemas/"
7676
- "./src:/var/www/webapp/src"
77+
- "./packages:/var/www/webapp/packages"
7778
- "./resources:/var/www/webapp/resources"
7879
- "./tests:/var/www/webapp/tests"
7980
- "./phpunit.xml.dist:/var/www/webapp/phpunit.xml.dist"

‎packages/command-parsers-lib/.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/vendor/
2+
.phpunit.result.cache
3+
clover.xml
4+
.idea/
5+
tags
6+
tags.*
7+
results.sarif

‎packages/command-parsers-lib/Dockerfile

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM php:8.3-cli
2+
3+
RUN apt-get update && apt-get upgrade -y
4+
RUN apt-get install -y git libzip-dev
5+
6+
RUN docker-php-ext-install zip
7+
RUN pecl install xdebug && docker-php-ext-enable xdebug
8+
9+
RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
10+

‎packages/command-parsers-lib/LICENSE

+165
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎packages/command-parsers-lib/Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
IMAGE_NAME=reconmap/php-output-command-parsers
2+
3+
all:
4+
composer install
5+
6+
test:
7+
composer exec phpunit
8+
9+
code-analysis:
10+
vendor/bin/psalm --report=results.sarif
11+
12+
image:
13+
docker build -t $(IMAGE_NAME) .
14+
15+
container:
16+
docker run -it --rm -v $(PWD):/app -w /app --entrypoint /bin/bash $(IMAGE_NAME)

0 commit comments

Comments
 (0)