From d8728762158cb9480911b6c6927d2d0ddce58c56 Mon Sep 17 00:00:00 2001 From: Mostafa Barmshory Date: Sat, 14 Mar 2020 18:24:08 +0330 Subject: [PATCH] Update to V6 --- .project | 19 +++++- composer.json | 103 +++++++++++++++++++++++++++++---- run.php | 69 ---------------------- src/Mall/relations.php | 12 ---- src6/Module.php | 7 +++ {src/Mall => src6}/module.json | 0 {src/Mall => src6}/urls.php | 0 test/.gitignore | 1 - 8 files changed, 116 insertions(+), 95 deletions(-) delete mode 100755 run.php delete mode 100755 src/Mall/relations.php create mode 100644 src6/Module.php rename {src/Mall => src6}/module.json (100%) rename {src/Mall => src6}/urls.php (100%) delete mode 100644 test/.gitignore diff --git a/.project b/.project index 56af786..1ac5843 100644 --- a/.project +++ b/.project @@ -15,6 +15,11 @@ + + org.eclipse.php.composer.core.builder.buildPathManagementBuilder + + + org.eclipse.wst.validation.validationbuilder @@ -32,12 +37,22 @@ - 1520155535113 + 1584123753104 + + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-location-matches-false-false-/*/build + + + + 1584123753108 10 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-vendor + 1.0-name-matches-false-false-/*/vendor/*/*/vendor + diff --git a/composer.json b/composer.json index 2ae8f7a..9c1ffc4 100644 --- a/composer.json +++ b/composer.json @@ -21,20 +21,13 @@ ], "minimum-stability" : "stable", "require" : { - "pluf/cache" : "5.13.x", - "pluf/cms" : "5.13.x", - "pluf/core" : "5.13.x", - "pluf/bank" : "5.13.x", - "pluf/assort" : "5.13.x", - "pluf/geo" : "5.13.x", - "pluf/shop" : "5.13.x" + "pluf/core" : "6.x", + "pluf/bank" : "6.x", + "pluf/shop" : "6.x" }, "require-dev" : { - "pluf/test" : "5.13.x" + "pluf/test" : "6.x" }, - "include-path" : [ - "src/" - ], "homepage" : "https://gitlab.com/microshop/mall", "support" : { "email" : "info@pluf.ir", @@ -47,5 +40,93 @@ "shop", "sell", "service" + ], + "include-path" : [ + "src/" + ], + "autoload" : { + "psr-4" : { + "Pluf\\Mall\\" : "src6" + }, + "psr-0" : { + "" : "src" + } + }, + "autoload-dev" : { + "psr-4" : { + "Pluf\\Test\\" : "tests" + } + }, + "repositories" : [{ + "type" : "path", + "url" : "../core", + "name" : "pluf/core", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../test", + "name" : "pluf/test", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../http2", + "name" : "pluf/http2", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../user", + "name" : "pluf/user", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../workflow", + "name" : "pluf/workflow", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../discount", + "name" : "pluf/discount", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../bank", + "name" : "pluf/bank", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../monitor", + "name" : "pluf/monitor", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../tenant", + "name" : "pluf/tenant", + "options" : { + "symlink" : true + } + }, { + "type" : "path", + "url" : "../shop", + "name" : "pluf/shop", + "options" : { + "symlink" : true + } + } ] } \ No newline at end of file diff --git a/run.php b/run.php deleted file mode 100755 index 2ef9ec4..0000000 --- a/run.php +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env php - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -if (version_compare('7.2.0', PHP_VERSION, '>')) { - fwrite( - STDERR, - sprintf( - 'This version of PHPUnit is supported on PHP 7.2, PHP 7.3, and PHP 7.4.' . PHP_EOL . - 'You are using PHP %s (%s).' . PHP_EOL, - PHP_VERSION, - PHP_BINARY - ) - ); - - die(1); -} - -if (!ini_get('date.timezone')) { - ini_set('date.timezone', 'UTC'); -} - -foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/../vendor/autoload.php', __DIR__ . '/vendor/autoload.php') as $file) { - if (file_exists($file)) { - define('PHPUNIT_COMPOSER_INSTALL', $file); - - break; - } -} - -unset($file); - -if (!defined('PHPUNIT_COMPOSER_INSTALL')) { - fwrite( - STDERR, - 'You need to set up the project dependencies using Composer:' . PHP_EOL . PHP_EOL . - ' composer install' . PHP_EOL . PHP_EOL . - 'You can learn all about Composer on https://getcomposer.org/.' . PHP_EOL - ); - - die(1); -} - -$options = getopt('', array('prepend:')); - -if (isset($options['prepend'])) { - require $options['prepend']; -} - -unset($options); - -require PHPUNIT_COMPOSER_INSTALL; - -// clean test data -require_once 'Pluf.php'; -$tmp_path = 'tests/tmp'; -Pluf_FileUtil::removedir($tmp_path); -if (!mkdir($tmp_path, 0777, true)) { - die('Failed to create temp folder...'); -} - -PHPUnit\TextUI\Command::main(); diff --git a/src/Mall/relations.php b/src/Mall/relations.php deleted file mode 100755 index 70e51c9..0000000 --- a/src/Mall/relations.php +++ /dev/null @@ -1,12 +0,0 @@ - array( - - ), - 'Mall_Service' => array( - - ), - 'Mall_Agency' => array( - - ), -); diff --git a/src6/Module.php b/src6/Module.php new file mode 100644 index 0000000..820ab10 --- /dev/null +++ b/src6/Module.php @@ -0,0 +1,7 @@ +