Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/HuasoFoundries/phpPgAdmin6.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Figueroa <amenadiel@gmail.com>2020-12-31 07:24:20 +0300
committerFelipe Figueroa <amenadiel@gmail.com>2020-12-31 07:24:20 +0300
commit5d80d357b68b21f54bb4c6aa8d4f0785c31f261f (patch)
tree491f38249868c00fa23c6fd6ffbbffe23c934ac6
parentbcaf420bfd9567b0660499f5ff8cd398b513ce0d (diff)
ignores develop tools for static analysis and code style
-rw-r--r--.github/workflows/coding_standards.yml4
-rw-r--r--.gitignore5
-rw-r--r--.phive/phars.xml9
-rw-r--r--README.md2
-rw-r--r--config.inc.php-dist (renamed from config.inc.example.php)0
-rw-r--r--mk_linters.mk2
-rw-r--r--src/lib.inc.php2
l---------tools/phpcs1
l---------tools/phpmd1
-rwxr-xr-xtools/reviewdogbin16261120 -> 0 bytes
10 files changed, 9 insertions, 17 deletions
diff --git a/.github/workflows/coding_standards.yml b/.github/workflows/coding_standards.yml
index c8204158..6a88a3be 100644
--- a/.github/workflows/coding_standards.yml
+++ b/.github/workflows/coding_standards.yml
@@ -92,8 +92,8 @@ jobs:
key: "php-${{ matrix.php_version }}-phpcs-${{ github.sha }}"
restore-keys: "php-${{ matrix.php_version }}-phpcs-"
-# - name: "Run CodeShiffer"
-# run: phpcs --standard=.phpcs.xml --parallel=2 --cache=.build/phpcs/php-cs.cache --report=checkstyle src/* | cs2pr
+ - name: "Run CodeShiffer"
+ run: phpcs --standard=.phpcs.xml --parallel=2 --cache=.build/phpcs/php-cs.cache --report=checkstyle src/* | cs2pr
- name: "Run friendsofphp/php-cs-fixer"
diff --git a/.gitignore b/.gitignore
index 9acfa9d8..07331071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,4 +60,7 @@ temp/*.report.json
temp/*.report.xml
tools/composer*
tools/phpcbf
-tools/phpmd_checkstyle \ No newline at end of file
+tools/phpmd_checkstyle
+.phive
+tools/reviewdog
+
diff --git a/.phive/phars.xml b/.phive/phars.xml
deleted file mode 100644
index 556fcde2..00000000
--- a/.phive/phars.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phive xmlns="https://phar.io/phive">
- <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./tools/composer-require-checker" copy="false"/>
- <phar name="phpmd" version="^2.7.0" installed="2.7.0" location="./tools/phpmd" copy="false"/>
- <phar name="phpcpd" version="^4.1.0" installed="4.1.0" location="./tools/phpcpd" copy="false"/>
- <phar name="phpcs" version="^3.5.3" installed="3.5.3" location="./tools/phpcs" copy="false"/>
- <phar name="phpcbf" version="^3.5.8" installed="3.5.8" location="./tools/phpcbf" copy="false"/>
- <phar name="composer-unused" version="^0.7.4" installed="0.7.4" location="./tools/composer-unused" copy="false"/>
-</phive>
diff --git a/README.md b/README.md
index df11d495..5496517c 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ composer install --no-dev
## Configuration
-You can set the config options either in a `config.inc.php` (refer to [config.inc.php-dist](config.inc.php-dist) for an example)
+You can set the config options either in a `config.inc.php` (refer to [config.inc.example.php](config.inc.example.php) for an example)
AND/OR a [config.yml](config.yml). The use of the latter is complely optional. Keep in mind the config entries are merged giving
precedence to the ones in the YAML file.
diff --git a/config.inc.example.php b/config.inc.php-dist
index a87b63c4..a87b63c4 100644
--- a/config.inc.example.php
+++ b/config.inc.php-dist
diff --git a/mk_linters.mk b/mk_linters.mk
index 9b4c07ff..faa2b816 100644
--- a/mk_linters.mk
+++ b/mk_linters.mk
@@ -104,7 +104,7 @@ ifeq (,$(reportformat))
$(eval reportformat='diff')
endif
@${MAKE} check_executable_or_exit_with_phive executable=$(executable) package_name=$(package_name) --no-print-directory
- @mkdir -p .build/phpcs && touch .build/phpcs/php-cs.cache ;\
+ @mkdir -p .build/phpcs && touch .build/phpcs/php-cs.cache
$(executable) --standard=.phpcs.xml --parallel=2 --cache=.build/phpcs/php-cs.cache --report=$(reportformat) src/*
diff --git a/src/lib.inc.php b/src/lib.inc.php
index eebef60d..c8e02d77 100644
--- a/src/lib.inc.php
+++ b/src/lib.inc.php
@@ -19,7 +19,7 @@ function getAppInstance(): App
$subfolder = '';
// Check to see if the configuration file exists, if not, explain
if (!\file_exists(\dirname(__DIR__) . '/config.inc.php')) {
- die('Configuration error: Copy config.inc.example.php to config.inc.php and edit appropriately.');
+ die('Configuration error: Copy config.inc.php-dist to config.inc.php and edit appropriately.');
}
$conf = [];
diff --git a/tools/phpcs b/tools/phpcs
deleted file mode 120000
index 18b16ce6..00000000
--- a/tools/phpcs
+++ /dev/null
@@ -1 +0,0 @@
-/home/ffflabs/.phive/phars/phpcs-3.5.3.phar \ No newline at end of file
diff --git a/tools/phpmd b/tools/phpmd
deleted file mode 120000
index 7384b0ce..00000000
--- a/tools/phpmd
+++ /dev/null
@@ -1 +0,0 @@
-/home/ffflabs/.phive/phars/phpmd-2.7.0.phar \ No newline at end of file
diff --git a/tools/reviewdog b/tools/reviewdog
deleted file mode 100755
index cf8bccd2..00000000
--- a/tools/reviewdog
+++ /dev/null
Binary files differ