From 2c0ce5bb43e6536624365247fd4b4b3513724d75 Mon Sep 17 00:00:00 2001 From: Abel Hoogeveen Date: Mon, 25 Jan 2021 12:35:10 +0100 Subject: [PATCH] Upgraded dependencies, upped LICENSE, removed testing framework. WebAppComponent is a simple wrapper. Nothing more. --- .gitignore | 2 +- .gitlab-ci.yml | 82 ----------------------------- .travis.yml | 12 ----- LICENSE | 2 +- composer.json | 15 ++---- test/autoload.php | 52 ------------------ test/phpunit.xml | 34 ------------ test/webapp/WebAppComponentTest.php | 57 -------------------- test/webapp/WebAppTestAbstract.php | 60 --------------------- 9 files changed, 7 insertions(+), 309 deletions(-) delete mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml delete mode 100644 test/autoload.php delete mode 100644 test/phpunit.xml delete mode 100644 test/webapp/WebAppComponentTest.php delete mode 100644 test/webapp/WebAppTestAbstract.php diff --git a/.gitignore b/.gitignore index 3331564..76d9905 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ build/ test/temp/ vendor/ application/ -www/ +www/ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 14bb468..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,82 +0,0 @@ -before_script: -# Install dependencies -- set -xe -- apt-get update -yqq -- apt-get install git zip unzip -yqq - -stages: - - build - - test - - deploy - -build:composer: - image: php:7.2 - stage: build - script: - - curl -sS https://getcomposer.org/installer | php - - php composer.phar install - cache: - key: "$CI_BUILD_REF_$CI_BUILD_REF_NAME" - paths: - - vendor/ - -test:7.1: - stage: test - image: php:7.1 - script: - - vendor/bin/phpunit -c test/phpunit.xml - cache: - key: "$CI_BUILD_REF_$CI_BUILD_REF_NAME" - paths: - - vendor - -test:7.2: - stage: test - image: php:7.2 - script: - - vendor/bin/phpunit -c test/phpunit.xml - cache: - key: "$CI_BUILD_REF_$CI_BUILD_REF_NAME" - paths: - - vendor/ - -test:7.3: - stage: test - image: php:7.3 - script: - - vendor/bin/phpunit -c test/phpunit.xml - cache: - key: "$CI_BUILD_REF_$CI_BUILD_REF_NAME" - paths: - - vendor/ - -test:coverage: - stage: test - image: php:7.2 - script: - - pecl install xdebug - - docker-php-ext-enable xdebug - - vendor/bin/phpunit -c test/phpunit.xml --coverage-text - cache: - key: "$CI_BUILD_REF_$CI_BUILD_REF_NAME" - paths: - - vendor/ - -release: - stage: deploy - image: php:7.2 - only: - - master - script: - - pecl install xdebug - - docker-php-ext-enable xdebug - - vendor/bin/phpunit -c test/phpunit.xml --coverage-text - artifacts: - name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}" - paths: - - build/ - expire_in: 3 weeks - cache: - key: "$CI_BUILD_REF_$CI_BUILD_REF_NAME" - paths: - - vendor/ \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4930ba4..0000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: php - -php: - - 7.1 - - 7.2 - - 7.3 - -script: - - php vendor/bin/phpunit -v -c test/phpunit.xml --coverage-text - -before_script: - - composer install diff --git a/LICENSE b/LICENSE index 82fedfb..17b19ba 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2013-2019 TechFuze +Copyright (c) 2013-2021 TechFuze Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/composer.json b/composer.json index 568369e..0857e3e 100644 --- a/composer.json +++ b/composer.json @@ -13,20 +13,15 @@ } ], "require": { - "php": ">=7.1.0", - "fuzeworks/core": "~1.2.0", - "fuzeworks/mvcr": "~1.2.0", - "fuzeworks/webcomponent": "~1.2.0", - "fuzeworks/tracycomponent": "~1.2.0", + "php": ">=7.4.0", + "fuzeworks/webcomponent": "~1.2.7", + "fuzeworks/tracycomponent": "~1.2.1", "fuzeworks/layout": "~1.2.0", - "fuzeworks/database": "~1.2.0", + "fuzeworks/database": "~1.2.3", "smarty/smarty": "3.1.*", - "latte/latte": "2.5.*", + "latte/latte": "2.10.*", "ext-json": "*" }, - "require-dev": { - "phpunit/phpunit": "^7" - }, "autoload": { "psr-4": { "FuzeWorks\\": "src/FuzeWorks/" diff --git a/test/autoload.php b/test/autoload.php deleted file mode 100644 index 4b38e69..0000000 --- a/test/autoload.php +++ /dev/null @@ -1,52 +0,0 @@ - - - - - ./ - - - - - - - - - - - - - ../ - - ../vendor/ - ../test/ - - - - \ No newline at end of file diff --git a/test/webapp/WebAppComponentTest.php b/test/webapp/WebAppComponentTest.php deleted file mode 100644 index 2db6aac..0000000 --- a/test/webapp/WebAppComponentTest.php +++ /dev/null @@ -1,57 +0,0 @@ -component = new WebAppComponent(); - } - - public function isInstance() - { - $this->assertInstanceOf('\FuzeWorks\WebAppComponent', $this->component); - } - -} diff --git a/test/webapp/WebAppTestAbstract.php b/test/webapp/WebAppTestAbstract.php deleted file mode 100644 index a34a30f..0000000 --- a/test/webapp/WebAppTestAbstract.php +++ /dev/null @@ -1,60 +0,0 @@ -config->discardConfigFiles(); - } -}