From 76e8017ede4e350b4e1c4c0f6f0efa14dad4d2cb Mon Sep 17 00:00:00 2001 From: Ryan Rathsam Date: Tue, 6 Aug 2024 08:33:42 -0400 Subject: [PATCH] Removing Unneeded Changes --- .circleci/config.yml | 7 ++++--- .editorconfig | 3 --- composer.json | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 422b8b20a4..c7f9131f56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ jobs: command: dnf install -y php libzip-devel php-pear php-devel - run: name: Install MongoDB Pear module - command: yes '' | pecl install mongodb || true + command: yes '' | pecl install mongodb-1.19.3 || true - run: name: install the composer dependencies command: composer install @@ -72,8 +72,9 @@ jobs: cp /etc/xdmod/portal_settings.ini ./configuration/portal_settings.ini cp /etc/xdmod/organization.json ./configuration/organization.json - run: - name: backup project directory for testing. - command: tar -cf ./xdmod.tar.gz * + name: Setup & Run QA Tests + command: | + ./tests/ci/scripts/qa-test-setup.sh - run: name: Clear out command-line PHP errors generated by composer installs command: > diff --git a/.editorconfig b/.editorconfig index 75c9711a9c..66f8c8f001 100644 --- a/.editorconfig +++ b/.editorconfig @@ -24,6 +24,3 @@ trim_trailing_whitespace = false [*.yml] indent_size = 2 - -[*.yaml] -indent_size = 2 diff --git a/composer.json b/composer.json index de561d84d5..c0ba9b2fab 100644 --- a/composer.json +++ b/composer.json @@ -208,8 +208,7 @@ "secure-http": false, "allow-plugins": { "composer/installers": true, - "simplesamlphp/composer-module-installer": true, - "dealerdirect/phpcodesniffer-composer-installer": true + "simplesamlphp/composer-module-installer": true } }, "autoload": {