Skip to content

Commit

Permalink
Merge branch 'release/7.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
mostafabarmshory committed Feb 10, 2021
2 parents 9908790 + 1213c90 commit 4b5d493
Show file tree
Hide file tree
Showing 386 changed files with 5,296 additions and 37,233 deletions.
67 changes: 61 additions & 6 deletions .buildpath
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
<attribute name="composer" value="source"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="examples/Relation">
<attributes>
<attribute name="composer" value="source"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="examples/Smallest">
<attributes>
<attribute name="composer" value="source"/>
Expand All @@ -28,6 +33,11 @@
<attribute name="composer" value="source"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/composer/package-versions-deprecated/src/PackageVersions">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/composer/semver/src">
<attributes>
<attribute name="composer" value="vendor"/>
Expand All @@ -38,7 +48,7 @@
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry excluding="semver/|spdx-licenses/|xdebug-handler/" kind="src" path="vendor/composer">
<buildpathentry excluding="package-versions-deprecated/|semver/|spdx-licenses/|xdebug-handler/" kind="src" path="vendor/composer">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
Expand Down Expand Up @@ -133,11 +143,6 @@
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/ocramius/package-versions/src/PackageVersions">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/pear/archive_tar">
<attributes>
<attribute name="composer" value="vendor"/>
Expand Down Expand Up @@ -238,6 +243,11 @@
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/phpunit/dbunit/src">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/phpunit/php-code-coverage/src">
<attributes>
<attribute name="composer" value="vendor"/>
Expand Down Expand Up @@ -368,11 +378,41 @@
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/polyfill-intl-idn">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry excluding="Resources/stubs/" kind="src" path="vendor/symfony/polyfill-intl-normalizer">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/polyfill-intl-normalizer/Resources/stubs">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/polyfill-mbstring">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry excluding="Resources/stubs/" kind="src" path="vendor/symfony/polyfill-php70">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/polyfill-php70/Resources/stubs">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/polyfill-php72">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry excluding="Resources/stubs/" kind="src" path="vendor/symfony/polyfill-php73">
<attributes>
<attribute name="composer" value="vendor"/>
Expand All @@ -383,11 +423,26 @@
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry excluding="Resources/stubs/" kind="src" path="vendor/symfony/polyfill-php80">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/polyfill-php80/Resources/stubs">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/service-contracts">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/symfony/yaml">
<attributes>
<attribute name="composer" value="vendor"/>
</attributes>
</buildpathentry>
<buildpathentry kind="src" path="vendor/theseer/tokenizer/src">
<attributes>
<attribute name="composer" value="vendor"/>
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,5 @@ clover.xml
/build/

# netbeans
/nbproject/private/
/nbproject/private/
/.build/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: php
php:
- '7.4'
- '8.0'

git:
depth: 1
Expand Down
13 changes: 13 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,16 @@ Stack Overflow has a growing collection of Composer related questions.
For development you need to have Docker and Docker-compose installed. Local PHP and Composer are not needed.

sudo apt-get install docker docker-compose


## Documents

### PHPDoc

Is used for developers

### User Manuals

Is used for users

SEE: https://en.wikipedia.org/wiki/ReStructuredText
28 changes: 7 additions & 21 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,13 @@
],
"minimum-stability" : "stable",
"require" : {
"pluf/http2" : "6.x",
"pear/mail" : "^1.3",
"pear/mail_mime" : "^1.10.0",
"guzzlehttp/guzzle" : "^6.2",
"webonyx/graphql-php" : "^0.12.5",
"phayes/geophp" : "^1.2",
"psr/log" : "~1.1"
"pluf/http2" : "7.x",
"pluf/scion" : "7.x",
"pluf/log" : "7.x",
"pluf/orm" : "7.x"
},
"include-path" : [
"src/"
],
"require-dev" : {
"phpunit/phpunit" : "~7.5",
"ockcyp/covers-validator" : "~1.0",
"squizlabs/php_codesniffer" : "~3.3",
"slevomat/coding-standard" : "~4.5",
"mediawiki/mediawiki-codesniffer" : "~23.0",
"phpstan/phpstan" : "~0.10.6"
"phpunit/phpunit" : "^9"
},
"support" : {
"wiki" : "https://github.com/pluf/core/wiki",
Expand All @@ -52,15 +41,12 @@
],
"autoload" : {
"psr-4" : {
"Pluf\\" : "src6/"
"Pluf\\Core\\" : "src/"
}
},
"autoload-dev" : {
"psr-4" : {
"Pluf\\NoteBook\\" : "examples/NoteBook",
"Pluf\\Smallest\\" : "examples/Smallest",
"Pluf\\HelloWord\\" : "examples/HelloWord",
"Pluf\\Test\\" : "tests/"
"Pluf\\Tests\\" : "tests/"
},
"psr-0" : {
"test" : ""
Expand Down
177 changes: 177 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
# Makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = build

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
endif

# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext

help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files"
@echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " qthelp to make HTML files and a qthelp project"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
@echo " text to make text files"
@echo " man to make manual pages"
@echo " texinfo to make Texinfo files"
@echo " info to make Texinfo files and run them through makeinfo"
@echo " gettext to make PO message catalogs"
@echo " changes to make an overview of all changed/added/deprecated items"
@echo " xml to make Docutils-native XML files"
@echo " pseudoxml to make pseudoxml-XML files for display purposes"
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"

clean:
rm -rf $(BUILDDIR)/*

html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."

singlehtml:
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."

pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."

json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."

htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."

qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/DSQL.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/DSQL.qhc"

devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/DSQL"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/DSQL"
@echo "# devhelp"

epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."

latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."

latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

latexpdfja:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."

man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."

texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."

info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
make -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."

gettext:
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
@echo
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."

changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."

linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."

doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."

xml:
$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
@echo
@echo "Build finished. The XML files are in $(BUILDDIR)/xml."

pseudoxml:
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
@echo
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
Loading

0 comments on commit 4b5d493

Please sign in to comment.