Skip to content

Commit

Permalink
Merge branch 'feature/php7' into develop
Browse files Browse the repository at this point in the history
Conflicts:
	.buildpath
	src/Pluf.php
	src6/Data/Schema.php
	src6/Db/Engine.php
	src6/DiContainerTrait.php
	src6/Dispatcher.php
	src6/ExceptionRenderer/Console.php
	src6/ExceptionRenderer/HTML.php
	src6/ExceptionRenderer/HTMLText.php
	src6/ExceptionRenderer/JSON.php
	src6/LoggerAppender/Console.php
	src6/Pluf/Search.php
	src6/Pluf/Session.php
	tests/Db/db/SelectTest.php
	tests/HTTP/URLTest.php
	tests/Pluf_Graphql/RenderTest.php
	tests/Pluf_Graphql_Compiler/ModelRelationTest.php
	tests/Pluf_Graphql_Compiler/ModelTest.php
	tests/Pluf_Graphql_Compiler/PaginatorTest.php
	tests/Pluf_Migration/InitTest.php
	tests/Pluf_Paginator/BuilderTest.php
  • Loading branch information
mostafabarmshory committed Feb 10, 2021
2 parents bdc5c9e + 54dd5e8 commit 0e0492b
Show file tree
Hide file tree
Showing 320 changed files with 1,872 additions and 38,813 deletions.
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
30 changes: 7 additions & 23 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +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/dbunit" : "*"
"phpunit/phpunit" : "^9"
},
"support" : {
"wiki" : "https://github.com/pluf/core/wiki",
Expand All @@ -53,16 +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\\Relation\\" : "examples/Relation",
"Pluf\\Test\\" : "tests/"
"Pluf\\Tests\\" : "tests/"
},
"psr-0" : {
"test" : ""
Expand Down
18 changes: 18 additions & 0 deletions docs/view/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@


View is the main part of the framework where input requests are processed and
the results generated.


.. code:: php
// Create Request
$request = Request::getInstance();
// load dispatcher and create response
$response = Dispatcher::getInstance()
->setControllers(__DIR__ . 'urls.php')
->dispatch($request);
// render response
$response->render();
17 changes: 0 additions & 17 deletions examples/HelloWord/Module.php

This file was deleted.

11 changes: 0 additions & 11 deletions examples/HelloWord/Views.php

This file was deleted.

4 changes: 0 additions & 4 deletions examples/HelloWord/module.json

This file was deleted.

9 changes: 0 additions & 9 deletions examples/HelloWord/urls.php

This file was deleted.

141 changes: 0 additions & 141 deletions examples/NoteBook/Book.php

This file was deleted.

93 changes: 0 additions & 93 deletions examples/NoteBook/Item.php

This file was deleted.

17 changes: 0 additions & 17 deletions examples/NoteBook/Module.php

This file was deleted.

Loading

0 comments on commit 0e0492b

Please sign in to comment.