Skip to content

Commit

Permalink
Introduce filesystem component
Browse files Browse the repository at this point in the history
The filesystem component makes an abstraction between guides and
flysystem. This makes it easier to maintain the project when external
dependencies are introducing breaking changes. The filesystem component
is just focused on the needs of phpDocumentor and shall not be seen
as a stand alone component to be used by other projects.

(cherry picked from commit b281d2d)

# Conflicts:
#	composer.json
#	composer.lock
#	packages/guides/composer.json
  • Loading branch information
jaapio committed Jan 29, 2025
1 parent d2ff3e4 commit 8989b36
Show file tree
Hide file tree
Showing 36 changed files with 1,191 additions and 153 deletions.
21 changes: 21 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"ext-json": "*",
"ext-mbstring": "*",
"doctrine/deprecations": "^1.1",
<<<<<<< HEAD
"phpdocumentor/guides": "^1.0@dev || ^0.3",
"phpdocumentor/guides-cli": "^1.0@dev || ^0.3",
"phpdocumentor/guides-code": "^1.0@dev || ^0.3",
Expand All @@ -46,6 +47,18 @@
"phpdocumentor/guides-restructured-text": "^1.0@dev || ^0.3",
"phpdocumentor/guides-theme-bootstrap": "^1.0@dev || ^0.3",
"phpdocumentor/guides-theme-rst": "^1.0@dev || ^1.0"
=======
"phpdocumentor/filesystem": "^2.0@dev",
"phpdocumentor/flyfinder": "^1.1 || ^2.0",
"phpdocumentor/guides": "^2.0@dev || ^1.0",
"phpdocumentor/guides-cli": "^2.0@dev || ^1.0",
"phpdocumentor/guides-code": "^2.0@dev || ^1.0",
"phpdocumentor/guides-graphs": "^2.0@dev || ^1.0",
"phpdocumentor/guides-markdown": "^2.0@dev || ^1.0",
"phpdocumentor/guides-restructured-text": "^2.0@dev || ^1.0",
"phpdocumentor/guides-theme-bootstrap": "^2.0@dev || ^1.0",
"phpdocumentor/guides-theme-rst": "^2.0@dev || ^1.0"
>>>>>>> b281d2d8 (Introduce filesystem component)
},
"require-dev": {
"ext-dom": "*",
Expand All @@ -57,11 +70,19 @@
"gajus/dindent": "^2.0.1",
"jangregor/phpstan-prophecy": "^1.0",
"league/csv": "^9.0",
<<<<<<< HEAD
"league/flysystem-memory": "^1.0",
"phpbench/phpbench": "^1.2",
"phpstan/extension-installer": "^1.3",
"phpstan/phpstan": "^1.10",
"phpstan/phpstan-strict-rules": "^1.5",
=======
"league/flysystem-memory": "^1.0 || ^3.29",
"phpbench/phpbench": "^1.3",
"phpstan/extension-installer": "^1.4",
"phpstan/phpstan": "^1.12",
"phpstan/phpstan-strict-rules": "^1.6",
>>>>>>> b281d2d8 (Introduce filesystem component)
"phpstan/phpstan-webmozart-assert": "^1.2",
"phpunit/phpunit": "^10.5",
"qossmic/deptrac-shim": "^1.0.2",
Expand Down
Loading

0 comments on commit 8989b36

Please sign in to comment.