From 8588763f2a6fc1d7b0204182f21408f6c5b79f4e Mon Sep 17 00:00:00 2001 From: Seth Battis Date: Fri, 15 Mar 2024 11:13:33 -0400 Subject: [PATCH] continuing toolchain work --- .gitignore | 2 +- composer.json | 19 +- composer.lock | 316 +++++++++++++++++++- packages/altru-administration/composer.json | 40 +-- packages/altru-analysis/composer.json | 40 +-- packages/altru-constituent/composer.json | 40 +-- packages/appengine-client/composer.json | 34 +-- packages/nxt-data-integration/composer.json | 40 +-- packages/oneroster/composer.json | 40 +-- packages/school/composer.json | 40 +-- phive.xml | 6 - phpdoc.dist.xml | 22 ++ {scripts => src}/map | 0 13 files changed, 486 insertions(+), 153 deletions(-) delete mode 100644 phive.xml create mode 100644 phpdoc.dist.xml rename {scripts => src}/map (100%) diff --git a/.gitignore b/.gitignore index b257712f..f5624ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ .DS_Store *.cache -/.cache/ +.cache /coverage/ node_modules /tools/ diff --git a/composer.json b/composer.json index bba4569b..c9265b45 100644 --- a/composer.json +++ b/composer.json @@ -36,27 +36,30 @@ } }, "scripts": { - "build": "Build\\CLI::build" + "build": [ + "Build\\CLI::build", + "docker run --rm -v $(pwd):/data phpdoc/phpdoc:3" + ] }, "extra": { "build": [ - "scripts/map -d 'var/2022-04-01_preview/Altru/alt-adnmg.json' 'packages/altru-administration/src' 'Blackbaud\\SKY'", - "scripts/map -d 'var/2022-04-01_preview/Altru/alt-anamg.json' 'packages/altru-analysis/src' 'Blackbaud\\SKY'", - "scripts/map -d 'var/2022-04-01_preview/Altru/alt-conmg.json' 'packages/altru-constituent/src' 'Blackbaud\\SKY'", - "scripts/map -d 'var/2022-04-01_preview/Church Management/nxt-data-integration.json' 'packages/nxt-data-integration/src' 'Blackbaud\\SKY'", - "scripts/map -d 'var/2022-04-01_preview/Education Management/afe-rostr.json' 'packages/oneroster/src' 'Blackbaud\\SKY'", - "scripts/map -d 'var/2022-04-01_preview/Education Management/school.json' 'packages/school/src' 'Blackbaud\\SKY'" + "src/map -d 'var/2022-04-01_preview/Altru/alt-adnmg.json' 'packages/altru-administration/src' 'Blackbaud\\SKY'", + "src/map -d 'var/2022-04-01_preview/Altru/alt-anamg.json' 'packages/altru-analysis/src' 'Blackbaud\\SKY'", + "src/map -d 'var/2022-04-01_preview/Altru/alt-conmg.json' 'packages/altru-constituent/src' 'Blackbaud\\SKY'", + "src/map -d 'var/2022-04-01_preview/Church Management/nxt-data-integration.json' 'packages/nxt-data-integration/src' 'Blackbaud\\SKY'", + "src/map -d 'var/2022-04-01_preview/Education Management/afe-rostr.json' 'packages/oneroster/src' 'Blackbaud\\SKY'", + "src/map -d 'var/2022-04-01_preview/Education Management/school.json' 'packages/school/src' 'Blackbaud\\SKY'" ] }, "config": { "sort-packages": true }, "replace": { - "battis/sky-api-appengine": "self.version", "groton-school/oauth2-blackbaudsky": "self.version", "groton-school/oauth2-blackbaudsky-example": "self.version", "groton-school/sky-api-altru-analysis": "self.version", "groton-school/sky-api-altru-constituent": "self.version", + "groton-school/sky-api-appengine": "self.version", "groton-school/sky-api-nxt-data-integration": "self.version", "groton-school/sky-api-oneroster": "self.version", "groton-school/sky-api-school": "self.version", diff --git a/composer.lock b/composer.lock index 90fa950c..871105d1 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b5c0afac9ff6ebf74140ac8b7188819b", + "content-hash": "2c327a4ee0e10fc8d9ade206404ea2b3", "packages": [ { "name": "battis/data-utilities", @@ -4174,6 +4174,121 @@ } ], "packages-dev": [ + { + "name": "nikic/php-parser", + "version": "v4.18.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + }, + "time": "2023-12-10T21:03:43+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "2.1.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "a691211e94ff39a34811abd521c31bd5b305b0bb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/a691211e94ff39a34811abd521c31bd5b305b0bb", + "reference": "a691211e94ff39a34811abd521c31bd5b305b0bb", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpunit/phpunit": "^8.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-01T13:42:41+00:00" + }, { "name": "symplify/monorepo-builder", "version": "11.2.20", @@ -4225,6 +4340,205 @@ } ], "time": "2023-11-17T08:30:16+00:00" + }, + { + "name": "theseer/directoryscanner", + "version": "1.3.3", + "source": { + "type": "git", + "url": "https://github.com/theseer/DirectoryScanner.git", + "reference": "4cdce31c1b5120779a01225b5b0968f9321342d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/DirectoryScanner/zipball/4cdce31c1b5120779a01225b5b0968f9321342d6", + "reference": "4cdce31c1b5120779a01225b5b0968f9321342d6", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A recursive directory scanner and filter", + "support": { + "issues": "https://github.com/theseer/DirectoryScanner/issues", + "source": "https://github.com/theseer/DirectoryScanner/tree/1.3.3" + }, + "time": "2021-07-24T18:41:34+00:00" + }, + { + "name": "theseer/fdomdocument", + "version": "1.6.7", + "source": { + "type": "git", + "url": "https://github.com/theseer/fDOMDocument.git", + "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fDOMDocument/zipball/5cddd4f9076a9a2b85c5135935bba2dcb3ed7574", + "reference": "5cddd4f9076a9a2b85c5135935bba2dcb3ed7574", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "lib-libxml": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "php": ">=7.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "lead" + } + ], + "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.", + "homepage": "https://github.com/theseer/fDOMDocument", + "support": { + "issues": "https://github.com/theseer/fDOMDocument/issues", + "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7" + }, + "abandoned": true, + "time": "2022-01-25T23:10:35+00:00" + }, + { + "name": "theseer/fxsl", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/theseer/fXSL.git", + "reference": "a9246376c713156e55c080782d4104bb07d4b899" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/fXSL/zipball/a9246376c713156e55c080782d4104bb07d4b899", + "reference": "a9246376c713156e55c080782d4104bb07d4b899", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xsl": "*", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "An XSL wrapper / extension to the PHP 5.x XSLTProcessor with Exception and extended Callback support", + "support": { + "issues": "https://github.com/theseer/fXSL/issues", + "source": "https://github.com/theseer/fXSL/tree/master" + }, + "abandoned": true, + "time": "2014-11-27T20:08:52+00:00" + }, + { + "name": "theseer/phpdox", + "version": "0.12.0", + "source": { + "type": "git", + "url": "https://github.com/theseer/phpdox.git", + "reference": "a46438e723a2b5bfd6ea4f299ecc0c7a1db1112c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/phpdox/zipball/a46438e723a2b5bfd6ea4f299ecc0c7a1db1112c", + "reference": "a46438e723a2b5bfd6ea4f299ecc0c7a1db1112c", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-fileinfo": "*", + "ext-iconv": "*", + "ext-mbstring": "*", + "ext-tokenizer": "*", + "ext-xsl": "*", + "nikic/php-parser": "^4.2", + "php": ">=7.1", + "phpunit/php-timer": "^2.0", + "theseer/directoryscanner": "^1.3.0", + "theseer/fdomdocument": "^1.6", + "theseer/fxsl": "^1.1" + }, + "bin": [ + "phpdox" + ], + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A fast Documentation generator for PHP Code using standard technology (SRC, DOCBLOCK, XML and XSLT) with event based processing", + "support": { + "issues": "https://github.com/theseer/phpdox/issues", + "source": "https://github.com/theseer/phpdox/tree/master" + }, + "time": "2019-03-13T09:34:17+00:00" } ], "aliases": [], diff --git a/packages/altru-administration/composer.json b/packages/altru-administration/composer.json index ae59de5f..061b7fac 100644 --- a/packages/altru-administration/composer.json +++ b/packages/altru-administration/composer.json @@ -1,23 +1,23 @@ { - "name": "groton-school/sky-api.oneroster", - "description": "PHP client for Blackbaud's SKY API - Altru Administration API", - "license": "GPL-3.0", - "autoload": { - "psr-4": { - "Blackbaud\\SKY\\": "src/" - } - }, - "authors": [ - { - "name": "Seth Battis", - "email": "sbattis@groton.org" - } - ], - "require": { - "battis/openapi-client-generator": "^0.1", - "groton-school/oauth2-blackbaudsky": "^0.2" - }, - "extra": { - "build": "scripts/map -d 'var/2022-04-01_preview/Altru/alt-adnmg.json' 'packages/altru-administration/src' 'Blackbaud\\SKY'" + "name": "groton-school/sky-api.oneroster", + "description": "PHP client for Blackbaud's SKY API - Altru Administration API", + "license": "GPL-3.0", + "autoload": { + "psr-4": { + "Blackbaud\\SKY\\": "src/" } + }, + "authors": [ + { + "name": "Seth Battis", + "email": "sbattis@groton.org" + } + ], + "require": { + "battis/openapi-client-generator": "^0.1", + "groton-school/oauth2-blackbaudsky": "^0.2" + }, + "extra": { + "build": "src/map -d 'var/2022-04-01_preview/Altru/alt-adnmg.json' 'packages/altru-administration/src' 'Blackbaud\\SKY'" + } } diff --git a/packages/altru-analysis/composer.json b/packages/altru-analysis/composer.json index 1ed50c18..6f253777 100644 --- a/packages/altru-analysis/composer.json +++ b/packages/altru-analysis/composer.json @@ -1,23 +1,23 @@ { - "name": "groton-school/sky-api.altru-analysis", - "description": "PHP client for Blackbaud's SKY API - Altru Analysis API", - "license": "GPL-3.0", - "autoload": { - "psr-4": { - "Blackbaud\\SKY\\": "src/" - } - }, - "authors": [ - { - "name": "Seth Battis", - "email": "sbattis@groton.org" - } - ], - "require": { - "battis/openapi-client-generator": "^0.1", - "groton-school/oauth2-blackbaudsky": "^0.2" - }, - "extra": { - "build": "scripts/map -d 'var/2022-04-01_preview/Altru/alt-anamg.json' 'packages/altru-analysis/src' 'Blackbaud\\SKY'" + "name": "groton-school/sky-api.altru-analysis", + "description": "PHP client for Blackbaud's SKY API - Altru Analysis API", + "license": "GPL-3.0", + "autoload": { + "psr-4": { + "Blackbaud\\SKY\\": "src/" } + }, + "authors": [ + { + "name": "Seth Battis", + "email": "sbattis@groton.org" + } + ], + "require": { + "battis/openapi-client-generator": "^0.1", + "groton-school/oauth2-blackbaudsky": "^0.2" + }, + "extra": { + "build": "src/map -d 'var/2022-04-01_preview/Altru/alt-anamg.json' 'packages/altru-analysis/src' 'Blackbaud\\SKY'" + } } diff --git a/packages/altru-constituent/composer.json b/packages/altru-constituent/composer.json index b90e5e45..54ba0df1 100644 --- a/packages/altru-constituent/composer.json +++ b/packages/altru-constituent/composer.json @@ -1,23 +1,23 @@ { - "name": "groton-school/sky-api.altru-constituent", - "description": "PHP client for Blackbaud's SKY API - Altru Constituent API", - "license": "GPL-3.0", - "autoload": { - "psr-4": { - "Blackbaud\\SKY\\": "src/" - } - }, - "authors": [ - { - "name": "Seth Battis", - "email": "sbattis@groton.org" - } - ], - "require": { - "battis/openapi-client-generator": "^0.1", - "groton-school/oauth2-blackbaudsky": "^0.2" - }, - "extra": { - "build": "scripts/map -d 'var/2022-04-01_preview/Altru/alt-conmg.json' 'packages/altru-constituent/src' 'Blackbaud\\SKY'" + "name": "groton-school/sky-api.altru-constituent", + "description": "PHP client for Blackbaud's SKY API - Altru Constituent API", + "license": "GPL-3.0", + "autoload": { + "psr-4": { + "Blackbaud\\SKY\\": "src/" } + }, + "authors": [ + { + "name": "Seth Battis", + "email": "sbattis@groton.org" + } + ], + "require": { + "battis/openapi-client-generator": "^0.1", + "groton-school/oauth2-blackbaudsky": "^0.2" + }, + "extra": { + "build": "src/map -d 'var/2022-04-01_preview/Altru/alt-conmg.json' 'packages/altru-constituent/src' 'Blackbaud\\SKY'" + } } diff --git a/packages/appengine-client/composer.json b/packages/appengine-client/composer.json index 451aebbb..5de6754e 100644 --- a/packages/appengine-client/composer.json +++ b/packages/appengine-client/composer.json @@ -1,20 +1,20 @@ { - "name": "battis/sky-api-appengine", - "description": "Blackbaud SKY API PHP client native to Google App Engine", - "license": "GPL-3.0", - "authors": [ - { - "name": "Seth Battis", - "email": "seth@battis.net" - } - ], - "require": { - "battis/lazy-secrets": "^1.1", - "battis/openapi-client-generator": "^0.1" - }, - "autoload": { - "psr-4": { - "GrotonSchool\\SKY\\AppEngine\\": "src" - } + "name": "groton-school/sky-api-appengine", + "description": "Blackbaud SKY API PHP client native to Google App Engine", + "license": "GPL-3.0", + "authors": [ + { + "name": "Seth Battis", + "email": "seth@battis.net" } + ], + "require": { + "battis/lazy-secrets": "^1.1", + "battis/openapi-client-generator": "^0.1" + }, + "autoload": { + "psr-4": { + "GrotonSchool\\SKY\\AppEngine\\": "src" + } + } } diff --git a/packages/nxt-data-integration/composer.json b/packages/nxt-data-integration/composer.json index 41c1472a..1b1db8f5 100644 --- a/packages/nxt-data-integration/composer.json +++ b/packages/nxt-data-integration/composer.json @@ -1,23 +1,23 @@ { - "name": "groton-school/sky-api.nxt-data-integration", - "description": "PHP client for Blackbaud's SKY API - NXT Data Integration API", - "license": "GPL-3.0", - "autoload": { - "psr-4": { - "Blackbaud\\SKY\\": "src/" - } - }, - "authors": [ - { - "name": "Seth Battis", - "email": "sbattis@groton.org" - } - ], - "require": { - "battis/openapi-client-generator": "^0.1", - "groton-school/oauth2-blackbaudsky": "^0.2" - }, - "extra": { - "build": "scripts/map -d 'var/2022-04-01_preview/Church Management/nxt-data-integration.json' 'packages/nxt-data-integration/src' 'Blackbaud\\SKY'" + "name": "groton-school/sky-api.nxt-data-integration", + "description": "PHP client for Blackbaud's SKY API - NXT Data Integration API", + "license": "GPL-3.0", + "autoload": { + "psr-4": { + "Blackbaud\\SKY\\": "src/" } + }, + "authors": [ + { + "name": "Seth Battis", + "email": "sbattis@groton.org" + } + ], + "require": { + "battis/openapi-client-generator": "^0.1", + "groton-school/oauth2-blackbaudsky": "^0.2" + }, + "extra": { + "build": "src/map -d 'var/2022-04-01_preview/Church Management/nxt-data-integration.json' 'packages/nxt-data-integration/src' 'Blackbaud\\SKY'" + } } diff --git a/packages/oneroster/composer.json b/packages/oneroster/composer.json index 367b0551..094dcf46 100644 --- a/packages/oneroster/composer.json +++ b/packages/oneroster/composer.json @@ -1,23 +1,23 @@ { - "name": "groton-school/sky-api.oneroster", - "description": "PHP client for Blackbaud's SKY API - OneRoster API", - "license": "GPL-3.0", - "autoload": { - "psr-4": { - "Blackbaud\\SKY\\": "src/" - } - }, - "authors": [ - { - "name": "Seth Battis", - "email": "sbattis@groton.org" - } - ], - "require": { - "battis/openapi-client-generator": "^0.1", - "groton-school/oauth2-blackbaudsky": "^0.2" - }, - "extra": { - "build": "scripts/map -d 'var/2022-04-01_preview/Education Management/afe-rostr.json' 'packages/oneroster/src' 'Blackbaud\\SKY'" + "name": "groton-school/sky-api.oneroster", + "description": "PHP client for Blackbaud's SKY API - OneRoster API", + "license": "GPL-3.0", + "autoload": { + "psr-4": { + "Blackbaud\\SKY\\": "src/" } + }, + "authors": [ + { + "name": "Seth Battis", + "email": "sbattis@groton.org" + } + ], + "require": { + "battis/openapi-client-generator": "^0.1", + "groton-school/oauth2-blackbaudsky": "^0.2" + }, + "extra": { + "build": "src/map -d 'var/2022-04-01_preview/Education Management/afe-rostr.json' 'packages/oneroster/src' 'Blackbaud\\SKY'" + } } diff --git a/packages/school/composer.json b/packages/school/composer.json index c0dcc7f6..717ec6b3 100644 --- a/packages/school/composer.json +++ b/packages/school/composer.json @@ -1,23 +1,23 @@ { - "name": "groton-school/sky-api.school", - "description": "PHP client for Blackbaud's SKY API - School API", - "license": "GPL-3.0", - "autoload": { - "psr-4": { - "Blackbaud\\SKY\\": "src/" - } - }, - "authors": [ - { - "name": "Seth Battis", - "email": "sbattis@groton.org" - } - ], - "require": { - "battis/openapi-client-generator": "^0.1", - "groton-school/oauth2-blackbaudsky": "^0.2" - }, - "extra": { - "build": "scripts/map -d 'var/2022-04-01_preview/Education Management/school.json' 'packages/school/src' 'Blackbaud\\SKY'" + "name": "groton-school/sky-api.school", + "description": "PHP client for Blackbaud's SKY API - School API", + "license": "GPL-3.0", + "autoload": { + "psr-4": { + "Blackbaud\\SKY\\": "src/" } + }, + "authors": [ + { + "name": "Seth Battis", + "email": "sbattis@groton.org" + } + ], + "require": { + "battis/openapi-client-generator": "^0.1", + "groton-school/oauth2-blackbaudsky": "^0.2" + }, + "extra": { + "build": "src/map -d 'var/2022-04-01_preview/Education Management/school.json' 'packages/school/src' 'Blackbaud\\SKY'" + } } diff --git a/phive.xml b/phive.xml deleted file mode 100644 index c46e4df0..00000000 --- a/phive.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/phpdoc.dist.xml b/phpdoc.dist.xml new file mode 100644 index 00000000..d3717ccd --- /dev/null +++ b/phpdoc.dist.xml @@ -0,0 +1,22 @@ + + + + docs + .cache/phpdoc + + + + + packages/appengine-client/src + packages/oauth2/src + packages/oneroster/src + packages/school/src + + + + diff --git a/scripts/map b/src/map similarity index 100% rename from scripts/map rename to src/map