diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..5aa6974 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +.git +.github +vendor +tests +examples/*/vendor +*.log diff --git a/.gitattributes b/.gitattributes index a45a036..a7fc084 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,6 @@ /tests export-ignore +/examples export-ignore +/benchmarks export-ignore +/.github export-ignore /.gitattributes export-ignore /.gitignore export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..961c8f3 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,413 @@ +# CI: test matrix + coverage, then on master/main push create a release branch + GitHub prerelease. +# Promote the prerelease to a full release to publish to Packagist (see packagist-release.yml). +# Pattern adapted from tishlang/tish CI (test, coverage, build) → release pipeline. + +name: CI (test, coverage, release) + +on: + push: + branches: [master, main, v2] + pull_request: + workflow_dispatch: + +permissions: + contents: read + +concurrency: + group: ci-${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + # Split by DB so each job only pulls one service image (Docker Hub flakes otherwise kill + # unrelated matrix cells). Official library images via public.ecr.aws avoid registry-1.docker.io. + test-pgsql: + name: PHP ${{ matrix.php }} / pgsql + runs-on: ubuntu-latest + timeout-minutes: 15 + permissions: + contents: read + checks: write + issues: write + pull-requests: write + strategy: + fail-fast: false + matrix: + php: ['8.3', '8.4'] + include: + - php: '8.3' + coverage: true + + services: + postgres: + image: public.ecr.aws/docker/library/postgres:16 + env: + POSTGRES_DB: tipsy + POSTGRES_USER: postgres + # Trust auth for ephemeral CI — avoids hardcoded password secrets scanners. + POSTGRES_HOST_AUTH_METHOD: trust + ports: + - 5432:5432 + options: >- + --health-cmd="pg_isready -U postgres" + --health-interval=10s + --health-timeout=5s + --health-retries=5 + + env: + DB: pgsql + + steps: + - name: Checkout + uses: actions/checkout@v5 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: pdo, pdo_mysql, pdo_pgsql, pdo_sqlite + coverage: ${{ matrix.coverage && 'xdebug' || 'none' }} + ini-values: short_open_tag=On + tools: composer:v2 + + - name: Get Composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT" + + - name: Cache Composer packages + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.lock') }} + restore-keys: | + ${{ runner.os }}-php-${{ matrix.php }}-composer- + ${{ runner.os }}-php-composer- + + - name: Validate composer.json + run: composer validate --strict --no-check-publish + + - name: Install dependencies + run: composer install --prefer-dist --no-progress --no-interaction + + - name: Start built-in server + run: php -S 127.0.0.1:8000 -t tests/web > /tmp/tipsy-php-server.log 2>&1 & + + - name: Wait for built-in server + run: | + for i in $(seq 1 30); do + if curl -sf "http://127.0.0.1:8000/" >/dev/null 2>&1 || curl -s -o /dev/null -w "%{http_code}" "http://127.0.0.1:8000/" | grep -Eq '^[0-9]+$'; then + exit 0 + fi + sleep 0.2 + done + echo "PHP built-in server failed to start" >&2 + cat /tmp/tipsy-php-server.log >&2 || true + exit 1 + + - name: Run tests + if: ${{ !matrix.coverage }} + run: composer test + + - name: Run tests with coverage + if: ${{ matrix.coverage }} + env: + XDEBUG_MODE: coverage + run: composer test:coverage + + - name: Upload coverage to Codecov + if: ${{ matrix.coverage }} + continue-on-error: true + uses: codecov/codecov-action@v5 + with: + files: build/logs/clover.xml + flags: php + fail_ci_if_error: false + handle_no_reports_found: true + token: ${{ secrets.CODECOV_TOKEN }} + + - name: Publish test results + if: ${{ matrix.coverage && always() }} + continue-on-error: true + uses: EnricoMi/publish-unit-test-result-action@v2 + with: + files: build/logs/junit.xml + check_name: Test results (PHPUnit) + + - name: Upload coverage artifact + if: ${{ matrix.coverage && always() }} + uses: actions/upload-artifact@v4 + with: + name: coverage-clover + path: build/logs/clover.xml + if-no-files-found: ignore + + test-mysql: + name: PHP ${{ matrix.php }} / mysql + runs-on: ubuntu-latest + timeout-minutes: 15 + permissions: + contents: read + strategy: + fail-fast: false + matrix: + php: ['8.3', '8.4'] + + services: + mysql: + image: public.ecr.aws/docker/library/mysql:8.0 + env: + MYSQL_ALLOW_EMPTY_PASSWORD: yes + MYSQL_DATABASE: tipsy + ports: + - 3306:3306 + options: >- + --health-cmd="mysqladmin ping -h 127.0.0.1" + --health-interval=10s + --health-timeout=5s + --health-retries=5 + + env: + DB: mysql + + steps: + - name: Checkout + uses: actions/checkout@v5 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: pdo, pdo_mysql, pdo_pgsql, pdo_sqlite + coverage: none + ini-values: short_open_tag=On + tools: composer:v2 + + - name: Get Composer cache directory + id: composer-cache + run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT" + + - name: Cache Composer packages + uses: actions/cache@v4 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.lock') }} + restore-keys: | + ${{ runner.os }}-php-${{ matrix.php }}-composer- + ${{ runner.os }}-php-composer- + + - name: Validate composer.json + run: composer validate --strict --no-check-publish + + - name: Install dependencies + run: composer install --prefer-dist --no-progress --no-interaction + + - name: Start built-in server + run: php -S 127.0.0.1:8000 -t tests/web > /tmp/tipsy-php-server.log 2>&1 & + + - name: Wait for built-in server + run: | + for i in $(seq 1 30); do + if curl -sf "http://127.0.0.1:8000/" >/dev/null 2>&1 || curl -s -o /dev/null -w "%{http_code}" "http://127.0.0.1:8000/" | grep -Eq '^[0-9]+$'; then + exit 0 + fi + sleep 0.2 + done + echo "PHP built-in server failed to start" >&2 + cat /tmp/tipsy-php-server.log >&2 || true + exit 1 + + - name: Run tests + run: composer test + + # Aggregate gate so release only needs one `needs` entry. + test: + name: Tests passed + runs-on: ubuntu-latest + needs: [test-pgsql, test-mysql] + steps: + - run: echo "All PHP/DB matrix jobs passed." + + release_check: + name: Release check (semantic-release dry-run) + runs-on: ubuntu-latest + if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && github.event_name == 'push' + steps: + - name: Checkout + uses: actions/checkout@v5 + with: + fetch-depth: 0 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: "24" + + - name: Dry-run (read-only config) + id: semantic + uses: cycjimmy/semantic-release-action@v4 + with: + dry_run: true + semantic_version: 25 + extra_plugins: | + @semantic-release/commit-analyzer@^13.0.0 + @semantic-release/release-notes-generator@^14.1.0 + conventional-changelog-conventionalcommits@^8.0.0 + env: + TIPSY_SEMANTIC_RELEASE_CI: "1" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Report release status + run: | + if [ "${{ steps.semantic.outputs.new_release_published }}" != "true" ]; then + echo "::notice::No version bump in these commits — skipping the release check (no feat/fix/perf/BREAKING CHANGE per conventional commits)." + echo "No incremental release would be triggered; skipping rather than failing." + exit 0 + fi + echo "Release would be triggered — check passed (next: ${{ steps.semantic.outputs.new_release_version }})." + + release: + name: Release (prerelease branch + GitHub API) + needs: [test, release_check] + if: (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && github.event_name == 'push' + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Checkout + uses: actions/checkout@v5 + with: + fetch-depth: 0 + + - name: Setup Node + uses: actions/setup-node@v4 + with: + node-version: "24" + + - name: Get next version (semantic-release dry-run) + id: next_version_semantic + uses: cycjimmy/semantic-release-action@v4 + with: + dry_run: true + semantic_version: 25 + extra_plugins: | + @semantic-release/commit-analyzer@^13.0.0 + @semantic-release/release-notes-generator@^14.1.0 + conventional-changelog-conventionalcommits@^8.0.0 + env: + TIPSY_SEMANTIC_RELEASE_CI: "1" + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Export next version for release steps + id: next_version + run: | + VERSION="${{ steps.next_version_semantic.outputs.new_release_version }}" + if [ -z "$VERSION" ]; then + echo "::notice::No version bump in these commits — skipping the release/publish steps." + echo "published=false" >> "$GITHUB_OUTPUT" + exit 0 + fi + echo "version=$VERSION" >> "$GITHUB_OUTPUT" + echo "published=true" >> "$GITHUB_OUTPUT" + echo "Next version: $VERSION" + + - name: Create or update release branch and push + if: steps.next_version.outputs.published == 'true' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + BRANCH="release/v${{ steps.next_version.outputs.version }}" + git checkout -B "$BRANCH" + git push origin "$BRANCH" --force + + - name: Generate release notes from commits + if: steps.next_version.outputs.published == 'true' + run: | + LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") + if [ -n "$LAST_TAG" ]; then + CHANGELOG=$(git log "$LAST_TAG..HEAD" --pretty=format:"- %s (%h)" --no-merges 2>/dev/null || echo "") + else + CHANGELOG=$(git log -30 --pretty=format:"- %s (%h)" --no-merges 2>/dev/null || echo "") + fi + [ -z "$CHANGELOG" ] && CHANGELOG="- No commits to list" + { + echo "## Changes" + echo "" + echo "$CHANGELOG" + echo "" + echo "---" + echo "" + echo "Promote this prerelease to a **full release** to publish \`tipsyphp/tipsy\` to Packagist." + } > release-body.md + + - name: Create or update GitHub prerelease via API + if: steps.next_version.outputs.published == 'true' + id: create_release + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + VERSION: ${{ steps.next_version.outputs.version }} + run: | + TAG="v${VERSION}" + BRANCH="release/v${VERSION}" + BODY=$(cat release-body.md) + RESP=$(curl -s -w "\n%{http_code}" -X POST \ + -H "Authorization: Bearer $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/repos/${{ github.repository }}/releases" \ + -d "{\"tag_name\":\"$TAG\",\"target_commitish\":\"$BRANCH\",\"name\":\"$TAG\",\"body\":$(echo "$BODY" | jq -Rs .),\"prerelease\":true}") + HTTP_CODE=$(echo "$RESP" | tail -n1) + BODY_RESP=$(echo "$RESP" | sed '$d') + if [ "$HTTP_CODE" = "201" ]; then + echo "Created prerelease $TAG" + RELEASE_ID=$(echo "$BODY_RESP" | jq -r .id) + elif [ "$HTTP_CODE" = "422" ]; then + RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \ + "https://api.github.com/repos/${{ github.repository }}/releases/tags/$TAG" | jq -r .id) + if [ "$RELEASE_ID" != "null" ] && [ -n "$RELEASE_ID" ]; then + curl -s -X PATCH \ + -H "Authorization: Bearer $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/repos/${{ github.repository }}/releases/$RELEASE_ID" \ + -d "{\"target_commitish\":\"$BRANCH\",\"body\":$(echo "$BODY" | jq -Rs .),\"prerelease\":true}" + echo "Updated existing prerelease $TAG" + else + echo "Release creation failed (422) and could not find release by tag" + exit 1 + fi + else + echo "Unexpected response: $HTTP_CODE" + echo "$BODY_RESP" + exit 1 + fi + echo "release_id=$RELEASE_ID" >> "$GITHUB_OUTPUT" + + - name: Download coverage artifact + if: steps.next_version.outputs.published == 'true' + continue-on-error: true + uses: actions/download-artifact@v4 + with: + name: coverage-clover + path: coverage + + - name: Upload coverage clover to prerelease + if: steps.next_version.outputs.published == 'true' + continue-on-error: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + RELEASE_ID="${{ steps.create_release.outputs.release_id }}" + REPO="${{ github.repository }}" + CLOVER="coverage/clover.xml" + if [ ! -f "$CLOVER" ]; then + echo "No clover.xml artifact — skipping asset upload" + exit 0 + fi + curl -s -X POST \ + -H "Authorization: Bearer $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + -H "Content-Type: application/xml" \ + --data-binary @"$CLOVER" \ + "https://uploads.github.com/repos/${REPO}/releases/${RELEASE_ID}/assets?name=clover.xml&label=PHPUnit%20coverage%20(clover)" diff --git a/.github/workflows/packagist-release.yml b/.github/workflows/packagist-release.yml new file mode 100644 index 0000000..122b961 --- /dev/null +++ b/.github/workflows/packagist-release.yml @@ -0,0 +1,101 @@ +# Publish tipsyphp/tipsy to Packagist when a GitHub release is promoted from prerelease to full release. +# Packagist syncs from the git tag; this job forces an update ping and links the Packagist URL on the release. + +name: Packagist release + +on: + release: + types: [published, edited] + workflow_dispatch: + inputs: + tag: + description: "Release tag to (re)publish, e.g. v2.0.0" + required: true + type: string + +permissions: + contents: write + +jobs: + publish: + name: Notify Packagist + if: ${{ github.event_name == 'workflow_dispatch' || github.event.release.prerelease == false }} + runs-on: ubuntu-latest + steps: + - name: Resolve tag + id: tag + run: | + TAG="${{ github.event.release.tag_name || inputs.tag }}" + echo "tag=$TAG" >> "$GITHUB_OUTPUT" + echo "version=${TAG#v}" >> "$GITHUB_OUTPUT" + + - name: Update Packagist package + env: + PACKAGIST_USERNAME: ${{ secrets.PACKAGIST_USERNAME }} + PACKAGIST_TOKEN: ${{ secrets.PACKAGIST_TOKEN }} + run: | + if [ -z "$PACKAGIST_USERNAME" ] || [ -z "$PACKAGIST_TOKEN" ]; then + echo "::warning::PACKAGIST_USERNAME / PACKAGIST_TOKEN secrets are not set." + echo "Packagist may still sync via the GitHub Service Hook if configured." + echo "Add secrets from https://packagist.org/profile/ (username + API token)." + exit 0 + fi + RESP=$(curl -sS -w "\n%{http_code}" -X POST \ + -H "Content-Type: application/json" \ + "https://packagist.org/api/update-package?username=${PACKAGIST_USERNAME}&apiToken=${PACKAGIST_TOKEN}" \ + -d '{"repository":{"url":"https://github.com/tipsyphp/tipsy"}}') + HTTP_CODE=$(echo "$RESP" | tail -n1) + BODY=$(echo "$RESP" | sed '$d') + echo "Packagist response ($HTTP_CODE): $BODY" + if [ "$HTTP_CODE" != "200" ] && [ "$HTTP_CODE" != "202" ]; then + echo "::error::Packagist update failed" + exit 1 + fi + + - name: Verify version on Packagist + continue-on-error: true + env: + VERSION: ${{ steps.tag.outputs.version }} + TAG: ${{ steps.tag.outputs.tag }} + run: | + # Packagist indexing can lag a few seconds; retry briefly. + for i in 1 2 3 4 5 6; do + if curl -sS "https://repo.packagist.org/p2/tipsyphp/tipsy.json" \ + | jq -e --arg v "$TAG" --arg v2 "$VERSION" \ + '.packages["tipsyphp/tipsy"][] | select(.version == $v or .version == $v2 or .version_normalized == ($v2 + ".0") or .version == ("v" + $v2))' \ + >/dev/null; then + echo "Found tipsyphp/tipsy@$TAG on Packagist" + exit 0 + fi + echo "Waiting for Packagist to index $TAG (attempt $i/6)..." + sleep 10 + done + echo "::warning::Could not confirm $TAG on Packagist yet — check https://packagist.org/packages/tipsyphp/tipsy" + + - name: Update release description with Packagist URL + if: github.event_name == 'release' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAG: ${{ steps.tag.outputs.tag }} + VERSION: ${{ steps.tag.outputs.version }} + run: | + PACKAGIST_URL="https://packagist.org/packages/tipsyphp/tipsy#${TAG}" + RELEASE_ID="${{ github.event.release.id }}" + REPO="${{ github.repository }}" + CURRENT_BODY=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \ + "https://api.github.com/repos/${REPO}/releases/${RELEASE_ID}" | jq -r '.body // ""') + if [[ "$CURRENT_BODY" == *"packagist.org"* ]]; then + echo "Release body already has Packagist link" + else + NEW_BODY="${CURRENT_BODY} + + --- + Published to Packagist: ${PACKAGIST_URL} + Install: \`composer require tipsyphp/tipsy:${VERSION}\`" + curl -s -X PATCH \ + -H "Authorization: Bearer $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github+json" \ + -H "X-GitHub-Api-Version: 2022-11-28" \ + "https://api.github.com/repos/${REPO}/releases/${RELEASE_ID}" \ + -d "$(printf '%s' "$NEW_BODY" | jq -Rs '{body: .}')" + fi diff --git a/.gitignore b/.gitignore index de0179d..9388183 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ /vendor/ .DS_Store nohup.out +tests/.phpunit.cache/ +/build/ +examples/*/vendor/ +examples/*/composer.lock diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a1cae3f..0000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -sudo: false - -language: - - php - -php: - - 7.1 - -env: - - DB=mysql - - DB=pgsql - -before_script: - - mkdir build - - phpenv config-add tests/php.ini - - mysql -e "create database IF NOT EXISTS tipsy;" -uroot; - - psql -c 'create database tipsy;' -U postgres - - composer self-update - - composer install - - nohup php -S localhost:8000 -c tests/php.ini -t tests/web & - -script: - - phpunit --configuration tests/phpunit.xml - -after_success: - - bash <(curl -s https://codecov.io/bash) - - php vendor/bin/coveralls -v - -addons: - postgresql: "9.4" - -services: - - postgresql diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 611b8b5..860b1f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,10 +4,7 @@ Found a bug? Got a suggestion? Feel free to check out the [Issue Tracker](https://github.com/tipsyphp/tipsy/issues) to make an issue. ##### Pull Requests -If you are really awesome, fix an issue by making a pull request. PRs are glady accepted on any of the projects on [tipsyphp](https://github.com/tipsyphp). When contributing to [tipsyphp/tipsy](https://github.com/tipsyphp/tipsy), please make sure your builds pass the unit tests using either [Travis CI](https://travis-ci.org/) or running the tests localy from the [Test Script](https://github.com/tipsyphp/tipsy/blob/master/tests/test.sh) using [PHPUnit](https://phpunit.de/). +If you are really awesome, fix an issue by making a pull request. PRs are gladly accepted on any of the projects on [tipsyphp](https://github.com/tipsyphp). When contributing to [tipsyphp/tipsy](https://github.com/tipsyphp/tipsy), please make sure your builds pass [GitHub Actions CI](https://github.com/tipsyphp/tipsy/actions) or run the suite locally with `composer test` (PHPUnit 11, PHP 8.3+). Prefer [conventional commits](https://www.conventionalcommits.org/) (`feat:`, `fix:`, `perf:`, `feat!:`) so releases can be cut automatically — see [docs/RELEASE.md](docs/RELEASE.md). ##### License Tipsy is licensed under the [MIT License](https://github.com/tipsyphp/tipsy/blob/master/LICENSE). - -##### More Info -For general questions join the [Tipsy Slack](https://tipsy-slack.herokuapp.com/) channel. diff --git a/README.md b/README.md index c2b17ce..5ef6c23 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ -Tipsy is an MVW (Model, View, Whatever) PHP micro framework inspired by [AngularJS](https://angularjs.org/). It provides a very lightweight, easy to use interface for websites, rest apis, and dependency injection. +Tipsy is an MVW (Model, View, Whatever) PHP micro framework inspired by [AngularJS](https://angularjs.org/). It provides a very lightweight, easy to use interface for websites, REST APIs, and dependency injection. +**Tipsy 2.0** targets **PHP 8.3+** with a typed core, **zero runtime Composer dependencies**, and a **PostgreSQL-first** database layer (MySQL and SQLite still supported). See [UPGRADING.md](UPGRADING.md) for breaking changes from 0.11.x. [![Latest Stable Version](https://poser.pugx.org/tipsyphp/tipsy/v/stable)](https://packagist.org/packages/tipsyphp/tipsy) -[![Build Status](https://travis-ci.org/tipsyphp/tipsy.svg?branch=master)](https://travis-ci.org/tipsyphp/tipsy) -[![Coverage Status](https://coveralls.io/repos/tipsyphp/tipsy/badge.svg?branch=master&service=github)](https://coveralls.io/github/tipsyphp/tipsy?branch=master) -[![Slack Status](https://tipsy-slack.herokuapp.com/badge.svg)](https://tipsy-slack.herokuapp.com/) +[![CI](https://github.com/tipsyphp/tipsy/actions/workflows/ci.yml/badge.svg)](https://github.com/tipsyphp/tipsy/actions/workflows/ci.yml) +[![codecov](https://codecov.io/gh/tipsyphp/tipsy/graph/badge.svg)](https://codecov.io/gh/tipsyphp/tipsy) --- ### Example Usage -See [Examples](https://github.com/tipsyphp/tipsy/wiki/Examples) for more detailed examples. See [Documentation](https://github.com/tipsyphp/tipsy/wiki) for more information. +See [examples/](examples/) in this repo for runnable apps. See [Documentation](https://github.com/tipsyphp/tipsy/wiki) for more information. ###### index.php ```php $app->home(function($View) { - $View->display('index', [user => 'crystal']); + $View->display('index', ['user' => 'crystal']); }); ``` @@ -35,5 +35,14 @@ $app->home(function($View) { To install using composer use the command below. For additional installation information see [Installation](https://github.com/tipsyphp/tipsy/wiki/Installation). ```sh -composer require tipsyphp/tipsy +composer require tipsyphp/tipsy:^2.0 ``` + +### Development + +```sh +composer install +composer test +``` + +CI runs PHP 8.3/8.4 × MySQL/PostgreSQL, then on `master`/`main` can open a GitHub prerelease (promote it to publish to Packagist). See [docs/RELEASE.md](docs/RELEASE.md). Performance notes live in [benchmarks/](benchmarks/). diff --git a/UPGRADING.md b/UPGRADING.md new file mode 100644 index 0000000..4b638ae --- /dev/null +++ b/UPGRADING.md @@ -0,0 +1,70 @@ +# Upgrading to Tipsy 2.0 + +Tipsy 2.0 is a hard break from the 0.11.x line. It targets **PHP 8.3+**, uses strict typing throughout, and drops PHP 5/7-era quirks. There are **no runtime Composer dependencies** — same thin-bootstrap identity as 0.x. + +## Requirements + +- PHP `>= 8.3` +- PHPUnit `^11` for development + +## Breaking changes + +| Change | Migration | +|--------|-----------| +| PHP floor raised to 8.3 | Upgrade the runtime before upgrading Tipsy | +| `Router::aliass()` renamed to `aliases()` | Rename call sites; the typo method is gone | +| Route `:param` matches one path segment (`[^/]+`), not `.*` | Use an explicit regex route if you need multi-segment captures | +| Unknown DI dependencies are `null` (was `false`) | Replace `=== false` checks with `=== null` / falsy checks | +| `App::run()` / `App::start()` return `void` | Do not use their return values | +| `Http` verifies SSL by default | Pass `skipSslVerify => true` for self-signed/local HTTPS | +| Curly-brace string offsets and bareword array keys | Use `$str[0]` and quoted keys (`['id' => 1]`) | +| Typed constructors / method signatures | Align subclasses (`Controller::init`, `Middleware::run`, etc.) | +| Default DB driver is **pgsql** (was mysql) | Set `driver=mysql` (or a `mysql://` URL) explicitly for MySQL | +| Resource SQL is dialect-aware | No need for `MysqlToPgsql` on normal Resource usage; opt in only for raw MySQL SQL on Postgres | + +## Database + +Tipsy 2.0 defaults to **PostgreSQL**. Supported drivers: `pgsql` (aliases: `postgres`, `postgresql`), `mysql`, `sqlite`. + +```ini +[db] +host=127.0.0.1 +user=postgres +pass=secret +database=app +driver=pgsql +``` + +MySQL: + +```ini +[db] +host=127.0.0.1 +user=root +pass= +database=app +driver=mysql +``` + +Optional: if you still write raw MySQL-flavored SQL against Postgres, register the compatibility layer: + +```php +$app->service('Db', Tipsy\Db\MysqlToPgsql::class); +``` + +## Intentional non-goals (2.0) + +- No PSR-7 / PSR-11 / PSR-15 adoption in core +- No new ORM, template engine, or heavy middleware stack +- No compatibility shims for PHP < 8.3 + +## Behavioral improvements worth knowing + +- Route patterns are precompiled at construction time +- DI caches `ReflectionFunction` parameter lists per closure +- `files` autoload still loads `src/Tipsy.php` so the `t` class alias and `getallheaders()` polyfill remain available +- Boolean model properties stay PHP `bool` after MySQL save (DB still stores `0`/`1`) + +## Examples + +In-repo examples use a Composer **path** repository pointing at the monorepo root for local development. After Packagist publishes `tipsyphp/tipsy` `^2.0`, deployable apps should depend on the Packagist constraint instead of the path repo. diff --git a/benchmarks/README.md b/benchmarks/README.md new file mode 100644 index 0000000..43de1a4 --- /dev/null +++ b/benchmarks/README.md @@ -0,0 +1,38 @@ +# Tipsy Hello World benchmark notes + +Tipsy’s historic “fast” claim came from [kenjis/php-framework-benchmark](https://github.com/kenjis/php-framework-benchmark) Hello World measurements (thin bootstrap, low memory) — not a formal award. + +## Goal for 2.0 + +Success is **no material regression** on modern PHP versus a typed Tipsy 2.0 baseline — not a claimed 2–5× gain from micro-optimizations. Platform wins (PHP 8.3/8.4 + OPcache) dominate. + +## App under test + +[`hello-world/index.php`](hello-world/index.php) — one route, JSON response, zero views/DB. + +## How to run + +```bash +# From repo root (PHP 8.3+ with OPcache recommended) +composer install + +# Terminal A +php -d opcache.enable_cli=1 -S 127.0.0.1:8088 -t benchmarks/hello-world + +# Terminal B — wrk (preferred) or ab +wrk -t2 -c50 -d10s http://127.0.0.1:8088/ +# or +ab -n 5000 -c 50 http://127.0.0.1:8088/ +``` + +Peak memory for a single request: + +```bash +php -d memory_limit=64M benchmarks/hello-world/memory.php +``` + +## Captured local sample (2026-08-07) + +Environment: PHP 8.3.33 NTS, macOS arm64, built-in server, no `wrk` installed in CI image — used `ab` when available. + +See [`RESULTS.md`](RESULTS.md) for the latest numbers checked into the branch. Re-run after significant router/DI changes. diff --git a/benchmarks/RESULTS.md b/benchmarks/RESULTS.md new file mode 100644 index 0000000..a77fb4c --- /dev/null +++ b/benchmarks/RESULTS.md @@ -0,0 +1,38 @@ +# Benchmark results + +Host: macOS arm64, PHP 8.3.33 NTS, ApacheBench (`ab -n 5000 -c 50`), PHP built-in server on `127.0.0.1:8088` + +## Tipsy 2.0 Hello World + +| Revision | RPS (mean of runs) | Peak memory | +|----------|--------------------|-------------| +| Pre-optimization (`b726b75`) | **13929** | 4 MB | +| Hot-path optimizations (this) | **14800–15215** (~6–9% ↑) | 4 MB | + +Sample after optimizations (3 consecutive runs): + +``` +Requests per second: 14882.37 [#/sec] +Requests per second: 15215.42 [#/sec] +Requests per second: 14434.60 [#/sec] +``` + +```bash +ab -n 5000 -c 50 http://127.0.0.1:8088/ +php benchmarks/hello-world/memory.php +``` + +## What changed + +- Exact/static routes use string compare instead of `preg_match` +- HTTP methods precomputed uppercase; request method cached +- Router match iterates backwards (no `array_reverse` allocation) +- DI skips rebuilding an `$avail` list (`_getDependency` already resolves unknowns) +- `Request::path` avoids `preg_replace` for script/dir stripping +- Removed unused `App` id/`random_bytes` on construct + +## vs origin/master (0.11.x) + +`origin/master` **cannot run on PHP 8.3+** (fatal curly-brace string offsets). Same-runtime comparison is not possible on this toolchain. + +Historical reference (external, PHP 7 era): kenjis Hello World had tipsy-0.10 around ~1377 req/s on that harness — different hardware/runtime. diff --git a/benchmarks/hello-world/index.php b/benchmarks/hello-world/index.php new file mode 100644 index 0000000..a3e17e4 --- /dev/null +++ b/benchmarks/hello-world/index.php @@ -0,0 +1,14 @@ +=5.5.0" + "php": ">=8.3" }, "require-dev": { - "satooshi/php-coveralls": "0.7.0", - "phpunit/phpunit": "3.7.*" + "phpunit/phpunit": "^11.0" }, "autoload": { "psr-4": { "Tipsy\\": "src/" }, - "files": [ - "src/Tipsy.php" - ] + "files": ["src/Tipsy.php"] + }, + "scripts": { + "test": "php -d short_open_tag=1 vendor/bin/phpunit --configuration tests/phpunit.xml --no-coverage", + "test:coverage": "php -d short_open_tag=1 vendor/bin/phpunit --configuration tests/phpunit.xml" }, "archive": { - "exclude": ["/tests", "/.travis.yml", "/.gitignore"] + "exclude": ["/tests", "/examples", "/benchmarks", "/.github", "/.gitignore"] } } diff --git a/composer.lock b/composer.lock index f2b8f04..4f845b3 100644 --- a/composer.lock +++ b/composer.lock @@ -1,189 +1,155 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3518b22d9b248a67f8a88bc2bba2ca5b", + "content-hash": "e70d39f2f7a97617e388bd02af8f25c5", "packages": [], "packages-dev": [ { - "name": "guzzle/guzzle", - "version": "v3.9.3", + "name": "myclabs/deep-copy", + "version": "1.13.4", "source": { "type": "git", - "url": "https://github.com/guzzle/guzzle3.git", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9" + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle3/zipball/0645b70d953bc1c067bbc8d5bc53194706b628d9", - "reference": "0645b70d953bc1c067bbc8d5bc53194706b628d9", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { - "ext-curl": "*", - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1" - }, - "replace": { - "guzzle/batch": "self.version", - "guzzle/cache": "self.version", - "guzzle/common": "self.version", - "guzzle/http": "self.version", - "guzzle/inflection": "self.version", - "guzzle/iterator": "self.version", - "guzzle/log": "self.version", - "guzzle/parser": "self.version", - "guzzle/plugin": "self.version", - "guzzle/plugin-async": "self.version", - "guzzle/plugin-backoff": "self.version", - "guzzle/plugin-cache": "self.version", - "guzzle/plugin-cookie": "self.version", - "guzzle/plugin-curlauth": "self.version", - "guzzle/plugin-error-response": "self.version", - "guzzle/plugin-history": "self.version", - "guzzle/plugin-log": "self.version", - "guzzle/plugin-md5": "self.version", - "guzzle/plugin-mock": "self.version", - "guzzle/plugin-oauth": "self.version", - "guzzle/service": "self.version", - "guzzle/stream": "self.version" + "php": "^7.1 || ^8.0" }, - "require-dev": { - "doctrine/cache": "~1.3", - "monolog/monolog": "~1.0", - "phpunit/phpunit": "3.7.*", - "psr/log": "~1.0", - "symfony/class-loader": "~2.1", - "zendframework/zend-cache": "2.*,<2.3", - "zendframework/zend-log": "2.*,<2.3" + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, - "suggest": { - "guzzlehttp/guzzle": "Guzzle 5 has moved to a new package name. The package you have installed, Guzzle 3, is deprecated." + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.9-dev" - } - }, "autoload": { - "psr-0": { - "Guzzle": "src/", - "Guzzle\\Tests": "tests/" + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - }, + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" + }, + "funding": [ { - "name": "Guzzle Community", - "homepage": "https://github.com/guzzle/guzzle/contributors" + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" } ], - "description": "PHP HTTP client. This library is deprecated in favor of https://packagist.org/packages/guzzlehttp/guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "client", - "curl", - "framework", - "http", - "http client", - "rest", - "web service" - ], - "time": "2015-03-18T18:23:50+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { - "name": "phpunit/php-code-coverage", - "version": "1.2.18", + "name": "nikic/php-parser", + "version": "v5.8.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b" + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", - "reference": "fe2466802556d3fe4e4d1d58ffd3ccfd0a19be0b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/044a6a392ff8ad0d61f14370a5fbbd0a0107152f", + "reference": "044a6a392ff8ad0d61f14370a5fbbd0a0107152f", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-file-iterator": ">=1.3.0@stable", - "phpunit/php-text-template": ">=1.2.0@stable", - "phpunit/php-token-stream": ">=1.1.3,<1.3.0" + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" }, "require-dev": { - "phpunit/phpunit": "3.7.*@dev" - }, - "suggest": { - "ext-dom": "*", - "ext-xdebug": ">=2.0.5" + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^9.0" }, + "bin": [ + "bin/php-parse" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "5.x-dev" } }, "autoload": { - "classmap": [ - "PHP/" - ] + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "name": "Nikita Popov" } ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "description": "A PHP parser written in PHP", "keywords": [ - "coverage", - "testing", - "xunit" + "parser", + "php" ], - "time": "2014-09-02T10:13:14+00:00" + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.8.0" + }, + "time": "2026-07-04T14:30:18+00:00" }, { - "name": "phpunit/php-file-iterator", - "version": "1.4.5", + "name": "phar-io/manifest", + "version": "2.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + "url": "https://github.com/phar-io/manifest.git", + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { - "php": ">=5.3.3" + "ext-dom": "*", + "ext-libxml": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -196,36 +162,51 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" + "email": "sebastian@phpunit.de", + "role": "Developer" } ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", - "keywords": [ - "filesystem", - "iterator" + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2024-03-03T12:33:53+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phar-io/version", + "version": "3.2.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -238,43 +219,69 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de", - "role": "lead" + "role": "Developer" } ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "time": "2015-06-21T13:50:34+00:00" + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" }, { - "name": "phpunit/php-timer", - "version": "1.0.9", + "name": "phpunit/php-code-coverage", + "version": "11.0.12", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2c1ed04922802c15e1de5d7447b4856de949cf56", + "reference": "2c1ed04922802c15e1de5d7447b4856de949cf56", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^5.7.0", + "php": ">=8.2", + "phpunit/php-file-iterator": "^5.1.0", + "phpunit/php-text-template": "^4.0.1", + "sebastian/code-unit-reverse-lookup": "^4.0.1", + "sebastian/complexity": "^4.0.1", + "sebastian/environment": "^7.2.1", + "sebastian/lines-of-code": "^3.0.1", + "sebastian/version": "^5.0.2", + "theseer/tokenizer": "^1.3.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^11.5.46" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "11.0.x-dev" } }, "autoload": { @@ -289,121 +296,151 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", "keywords": [ - "timer" + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/11.0.12" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-code-coverage", + "type": "tidelift" + } ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2025-12-24T07:01:01+00:00" }, { - "name": "phpunit/php-token-stream", - "version": "1.2.2", + "name": "phpunit/php-file-iterator", + "version": "5.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", - "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/2f3a64888c814fc235386b7387dd5b5ed92ad903", + "reference": "2f3a64888c814fc235386b7387dd5b5ed92ad903", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-main": "5.1-dev" } }, "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", "keywords": [ - "tokenizer" + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/5.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator", + "type": "tidelift" + } ], - "time": "2014-03-03T05:10:30+00:00" + "time": "2026-02-02T13:52:54+00:00" }, { - "name": "phpunit/phpunit", - "version": "3.7.38", + "name": "phpunit/php-invoker", + "version": "5.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/38709dc22d519a3d1be46849868aa2ddf822bcf6", - "reference": "38709dc22d519a3d1be46849868aa2ddf822bcf6", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/c1ca3814734c07492b3d4c5f794f4b0995333da2", + "reference": "c1ca3814734c07492b3d4c5f794f4b0995333da2", "shasum": "" }, "require": { - "ext-ctype": "*", - "ext-dom": "*", - "ext-json": "*", - "ext-pcre": "*", - "ext-reflection": "*", - "ext-spl": "*", - "php": ">=5.3.3", - "phpunit/php-code-coverage": "~1.2", - "phpunit/php-file-iterator": "~1.3", - "phpunit/php-text-template": "~1.1", - "phpunit/php-timer": "~1.0", - "phpunit/phpunit-mock-objects": "~1.2", - "symfony/yaml": "~2.0" + "php": ">=8.2" }, "require-dev": { - "pear-pear.php.net/pear": "1.9.4" + "ext-pcntl": "*", + "phpunit/phpunit": "^11.0" }, "suggest": { - "phpunit/php-invoker": "~1.1" + "ext-pcntl": "*" }, - "bin": [ - "composer/bin/phpunit" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.7.x-dev" + "dev-main": "5.0-dev" } }, "autoload": { "classmap": [ - "PHPUnit/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "", - "../../symfony/yaml/" - ], "license": [ "BSD-3-Clause" ], @@ -414,635 +451,1335 @@ "role": "lead" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "http://www.phpunit.de/", + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", "keywords": [ - "phpunit", - "testing", - "xunit" + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "security": "https://github.com/sebastianbergmann/php-invoker/security/policy", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/5.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } ], - "time": "2014-10-17T09:04:17+00:00" + "time": "2024-07-03T05:07:44+00:00" }, { - "name": "phpunit/phpunit-mock-objects", - "version": "1.2.3", + "name": "phpunit/php-text-template", + "version": "4.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875", - "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/3e0404dc6b300e6bf56415467ebcb3fe4f33e964", + "reference": "3e0404dc6b300e6bf56415467ebcb3fe4f33e964", "shasum": "" }, "require": { - "php": ">=5.3.3", - "phpunit/php-text-template": ">=1.1.1@stable" + "php": ">=8.2" }, - "suggest": { - "ext-soap": "*" + "require-dev": { + "phpunit/phpunit": "^11.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, "autoload": { "classmap": [ - "PHPUnit/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "mock", - "xunit" + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/4.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } ], - "time": "2013-01-13T10:24:48+00:00" + "time": "2024-07-03T05:08:43+00:00" }, { - "name": "psr/log", - "version": "1.0.2", + "name": "phpunit/php-timer", + "version": "7.0.1", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", + "reference": "3b415def83fbcb41f991d9ebf16ae4ad8b7837b3", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-main": "7.0-dev" } }, "autoload": { - "psr-4": { - "Psr\\Log\\": "Psr/Log/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "log", - "psr", - "psr-3" + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "security": "https://github.com/sebastianbergmann/php-timer/security/policy", + "source": "https://github.com/sebastianbergmann/php-timer/tree/7.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } ], - "time": "2016-10-10T12:19:37+00:00" + "time": "2024-07-03T05:09:35+00:00" }, { - "name": "satooshi/php-coveralls", - "version": "v0.7.0", + "name": "phpunit/phpunit", + "version": "11.5.56", "source": { "type": "git", - "url": "https://github.com/satooshi/php-coveralls.git", - "reference": "cad8736dd2ee4419221044d4f154f7e93d77ba4a" + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "5f83edffa6967c3db468d48a695ec7bcb02e9256" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/satooshi/php-coveralls/zipball/cad8736dd2ee4419221044d4f154f7e93d77ba4a", - "reference": "cad8736dd2ee4419221044d4f154f7e93d77ba4a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5f83edffa6967c3db468d48a695ec7bcb02e9256", + "reference": "5f83edffa6967c3db468d48a695ec7bcb02e9256", "shasum": "" }, "require": { + "ext-dom": "*", + "ext-filter": "*", "ext-json": "*", - "ext-simplexml": "*", - "guzzle/guzzle": "^2.8|^3.0", - "php": ">=5.3.3", - "psr/log": "^1.0", - "symfony/config": "^2.4|^3.0", - "symfony/console": "^2.1|^3.0", - "symfony/stopwatch": "^2.2|^3.0", - "symfony/yaml": "^2.1|^3.0" + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.13.4", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=8.2", + "phpunit/php-code-coverage": "^11.0.12", + "phpunit/php-file-iterator": "^5.1.1", + "phpunit/php-invoker": "^5.0.1", + "phpunit/php-text-template": "^4.0.1", + "phpunit/php-timer": "^7.0.1", + "sebastian/cli-parser": "^3.0.2", + "sebastian/code-unit": "^3.0.3", + "sebastian/comparator": "^6.3.3", + "sebastian/diff": "^6.0.2", + "sebastian/environment": "^7.2.1", + "sebastian/exporter": "^6.3.2", + "sebastian/global-state": "^7.0.2", + "sebastian/object-enumerator": "^6.0.1", + "sebastian/recursion-context": "^6.0.3", + "sebastian/type": "^5.1.3", + "sebastian/version": "^5.0.2", + "staabm/side-effects-detector": "^1.0.5" }, "suggest": { - "symfony/http-kernel": "Allows Symfony integration" + "ext-soap": "To be able to generate mocks based on WSDL files" }, "bin": [ - "bin/coveralls" + "phpunit" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "0.7-dev" + "dev-main": "11.5-dev" } }, "autoload": { - "psr-4": { - "Satooshi\\": "src/Satooshi/" - } + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Kitamura Satoshi", - "email": "with.no.parachute@gmail.com", - "homepage": "https://www.facebook.com/satooshi.jp" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "PHP client library for Coveralls API", - "homepage": "https://github.com/satooshi/php-coveralls", + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", "keywords": [ - "ci", - "coverage", - "github", - "test" + "phpunit", + "testing", + "xunit" ], - "time": "2015-12-14T17:50:37+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.56" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsoring.html", + "type": "other" + } + ], + "time": "2026-07-06T14:52:39+00:00" }, { - "name": "symfony/config", - "version": "v3.4.3", + "name": "sebastian/cli-parser", + "version": "3.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "cfd5c972f7b4992a5df41673d25d980ab077aa5b" + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/cfd5c972f7b4992a5df41673d25d980ab077aa5b", - "reference": "cfd5c972f7b4992a5df41673d25d980ab077aa5b", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/15c5dd40dc4f38794d383bb95465193f5e0ae180", + "reference": "15c5dd40dc4f38794d383bb95465193f5e0ae180", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0" - }, - "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" + "php": ">=8.2" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/finder": "~3.3|~4.0", - "symfony/yaml": "~3.0|~4.0" - }, - "suggest": { - "symfony/yaml": "To use the yaml reference dumper" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-main": "3.0-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Config\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/3.0.2" + }, + "funding": [ { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "url": "https://github.com/sebastianbergmann", + "type": "github" } ], - "description": "Symfony Config Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2024-07-03T04:41:36+00:00" }, { - "name": "symfony/console", - "version": "v3.4.3", + "name": "sebastian/code-unit", + "version": "3.0.3", "source": { "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "8394c8ef121949e8f858f13bc1e34f05169e4e7d" + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8394c8ef121949e8f858f13bc1e34f05169e4e7d", - "reference": "8394c8ef121949e8f858f13bc1e34f05169e4e7d", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/54391c61e4af8078e5b276ab082b6d3c54c9ad64", + "reference": "54391c61e4af8078e5b276ab082b6d3c54c9ad64", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/polyfill-mbstring": "~1.0" - }, - "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/process": "<3.3" + "php": ">=8.2" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "phpunit/phpunit": "^11.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-main": "3.0-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "security": "https://github.com/sebastianbergmann/code-unit/security/policy", + "source": "https://github.com/sebastianbergmann/code-unit/tree/3.0.3" + }, + "funding": [ { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "url": "https://github.com/sebastianbergmann", + "type": "github" } ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "time": "2025-03-19T07:56:08+00:00" }, { - "name": "symfony/debug", - "version": "v4.0.3", + "name": "sebastian/code-unit-reverse-lookup", + "version": "4.0.1", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "9ae4223a661b56a9abdce144de4886cca37f198f" + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "183a9b2632194febd219bb9246eee421dad8d45e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/9ae4223a661b56a9abdce144de4886cca37f198f", - "reference": "9ae4223a661b56a9abdce144de4886cca37f198f", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/183a9b2632194febd219bb9246eee421dad8d45e", + "reference": "183a9b2632194febd219bb9246eee421dad8d45e", "shasum": "" }, "require": { - "php": "^7.1.3", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": "<3.4" + "php": ">=8.2" }, "require-dev": { - "symfony/http-kernel": "~3.4|~4.0" + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "security": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/security/policy", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/4.0.1" + }, + "funding": [ { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "url": "https://github.com/sebastianbergmann", + "type": "github" } ], - "description": "Symfony Debug Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T17:15:19+00:00" + "time": "2024-07-03T04:45:54+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v2.8.33", + "name": "sebastian/comparator", + "version": "6.3.3", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc" + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d64be24fc1eba62f9daace8a8918f797fc8e87cc", - "reference": "d64be24fc1eba62f9daace8a8918f797fc8e87cc", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", + "reference": "2c95e1e86cb8dd41beb8d502057d1081ccc8eca9", "shasum": "" }, "require": { - "php": ">=5.3.9" + "ext-dom": "*", + "ext-mbstring": "*", + "php": ">=8.2", + "sebastian/diff": "^6.0", + "sebastian/exporter": "^6.0" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "^2.0.5|~3.0.0", - "symfony/dependency-injection": "~2.6|~3.0.0", - "symfony/expression-language": "~2.6|~3.0.0", - "symfony/stopwatch": "~2.3|~3.0.0" + "phpunit/phpunit": "^11.4" }, "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "ext-bcmath": "For comparing BcMath\\Number objects" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-main": "6.3-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" } ], - "description": "Symfony EventDispatcher Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:36:31+00:00" - }, - { - "name": "symfony/filesystem", - "version": "v4.0.3", - "source": { - "type": "git", - "url": "https://github.com/symfony/filesystem.git", - "reference": "760e47a4ee64b4c48f4b30017011e09d4c0f05ed" + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/6.3.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" + } + ], + "time": "2026-01-24T09:26:40+00:00" + }, + { + "name": "sebastian/complexity", + "version": "4.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "ee41d384ab1906c68852636b6de493846e13e5a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/760e47a4ee64b4c48f4b30017011e09d4c0f05ed", - "reference": "760e47a4ee64b4c48f4b30017011e09d4c0f05ed", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/ee41d384ab1906c68852636b6de493846e13e5a0", + "reference": "ee41d384ab1906c68852636b6de493846e13e5a0", "shasum": "" }, "require": { - "php": "^7.1.3" + "nikic/php-parser": "^5.0", + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Filesystem\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/4.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-07-03T04:49:50+00:00" + }, + { + "name": "sebastian/diff", + "version": "6.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544", + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.0", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" } ], - "description": "Symfony Filesystem Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:38:00+00:00" + "time": "2024-07-03T04:53:05+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.6.0", + "name": "sebastian/environment", + "version": "7.2.1", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/a5c75038693ad2e8d4b6c15ba2403532647830c4", + "reference": "a5c75038693ad2e8d4b6c15ba2403532647830c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.3" }, "suggest": { - "ext-mbstring": "For best performance" + "ext-posix": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-main": "7.2-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "https://github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/7.2.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" }, - "files": [ - "bootstrap.php" + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/environment", + "type": "tidelift" + } + ], + "time": "2025-05-21T11:55:47+00:00" + }, + { + "name": "sebastian/exporter", + "version": "6.3.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "70a298763b40b213ec087c51c739efcaa90bcd74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/70a298763b40b213ec087c51c739efcaa90bcd74", + "reference": "70a298763b40b213ec087c51c739efcaa90bcd74", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=8.2", + "sebastian/recursion-context": "^6.0" + }, + "require-dev": { + "phpunit/phpunit": "^11.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.3-dev" + } + }, + "autoload": { + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" } ], - "description": "Symfony polyfill for the Mbstring extension", - "homepage": "https://symfony.com", + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" + } ], - "time": "2017-10-11T12:05:26+00:00" + "time": "2025-09-24T06:12:51+00:00" }, { - "name": "symfony/stopwatch", - "version": "v3.4.3", + "name": "sebastian/global-state", + "version": "7.0.2", "source": { "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d" + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "3be331570a721f9a4b5917f4209773de17f747d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/c865551df7c17e63fc1f09f763db04387f91ae4d", - "reference": "c865551df7c17e63fc1f09f763db04387f91ae4d", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/3be331570a721f9a4b5917f4209773de17f747d7", + "reference": "3be331570a721f9a4b5917f4209773de17f747d7", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": ">=8.2", + "sebastian/object-reflector": "^4.0", + "sebastian/recursion-context": "^6.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^11.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-main": "7.0-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/7.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-07-03T04:57:36+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d36ad0d782e5756913e42ad87cb2890f4ffe467a", + "reference": "d36ad0d782e5756913e42ad87cb2890f4ffe467a", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^5.0", + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-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": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/3.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-07-03T04:58:38+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "6.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "f5b498e631a74204185071eb41f33f38d64608aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/f5b498e631a74204185071eb41f33f38d64608aa", + "reference": "f5b498e631a74204185071eb41f33f38d64608aa", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "sebastian/object-reflector": "^4.0", + "sebastian/recursion-context": "^6.0" + }, + "require-dev": { + "phpunit/phpunit": "^11.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/6.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-07-03T05:00:13+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "4.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/6e1a43b411b2ad34146dee7524cb13a068bb35f9", + "reference": "6e1a43b411b2ad34146dee7524cb13a068bb35f9", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "security": "https://github.com/sebastianbergmann/object-reflector/security/policy", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/4.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-07-03T05:01:32+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "6.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/f6458abbf32a6c8174f8f26261475dc133b3d9dc", + "reference": "f6458abbf32a6c8174f8f26261475dc133b3d9dc", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "6.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" } ], - "description": "Symfony Stopwatch Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:37:34+00:00" + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/6.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" + } + ], + "time": "2025-08-13T04:42:22+00:00" }, { - "name": "symfony/yaml", - "version": "v2.8.33", + "name": "sebastian/type", + "version": "5.1.3", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "be720fcfae4614df204190d57795351059946a77" + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/be720fcfae4614df204190d57795351059946a77", - "reference": "be720fcfae4614df204190d57795351059946a77", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/f77d2d4e78738c98d9a68d2596fe5e8fa380f449", + "reference": "f77d2d4e78738c98d9a68d2596fe5e8fa380f449", "shasum": "" }, "require": { - "php": ">=5.3.9" + "php": ">=8.2" + }, + "require-dev": { + "phpunit/phpunit": "^11.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.8-dev" + "dev-main": "5.1-dev" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "security": "https://github.com/sebastianbergmann/type/security/policy", + "source": "https://github.com/sebastianbergmann/type/tree/5.1.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" }, - "exclude-from-classmap": [ - "/Tests/" + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/type", + "type": "tidelift" + } + ], + "time": "2025-08-09T06:55:48+00:00" + }, + { + "name": "sebastian/version", + "version": "5.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c687e3387b99f5b03b6caa64c74b63e2936ff874", + "reference": "c687e3387b99f5b03b6caa64c74b63e2936ff874", + "shasum": "" + }, + "require": { + "php": ">=8.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.0-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": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "security": "https://github.com/sebastianbergmann/version/security/policy", + "source": "https://github.com/sebastianbergmann/version/tree/5.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-10-09T05:16:32+00:00" + }, + { + "name": "staabm/side-effects-detector", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/staabm/side-effects-detector.git", + "reference": "d8334211a140ce329c13726d4a715adbddd0a163" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/staabm/side-effects-detector/zipball/d8334211a140ce329c13726d4a715adbddd0a163", + "reference": "d8334211a140ce329c13726d4a715adbddd0a163", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan": "^1.12.6", + "phpunit/phpunit": "^9.6.21", + "symfony/var-dumper": "^5.4.43", + "tomasvotruba/type-coverage": "1.0.0", + "tomasvotruba/unused-public": "1.0.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "lib/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], + "description": "A static analysis tool to detect side effects in PHP code", + "keywords": [ + "static analysis" + ], + "support": { + "issues": "https://github.com/staabm/side-effects-detector/issues", + "source": "https://github.com/staabm/side-effects-detector/tree/1.0.5" + }, + "funding": [ + { + "url": "https://github.com/staabm", + "type": "github" + } + ], + "time": "2024-10-20T05:08:20+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.3.1" + }, + "funding": [ { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "url": "https://github.com/theseer", + "type": "github" } ], - "description": "Symfony Yaml Component", - "homepage": "https://symfony.com", - "time": "2018-01-03T07:36:31+00:00" + "time": "2025-11-17T20:03:58+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.5.0" + "php": ">=8.3" }, - "platform-dev": [] + "platform-dev": {}, + "plugin-api-version": "2.9.0" } diff --git a/docs/RELEASE.md b/docs/RELEASE.md new file mode 100644 index 0000000..dccdefa --- /dev/null +++ b/docs/RELEASE.md @@ -0,0 +1,112 @@ +# How to Release Tipsy + +Step-by-step guide. Do these in order. + +The pipeline mirrors [tish](https://github.com/tishlang/tish): CI creates a **prerelease**; you promote it to a full release to publish to Packagist. + +--- + +## Before You Start: One-Time Setup + +### 1. GitHub Secrets (Settings → Secrets and variables → Actions) + +| Secret | How to get it | +|--------|---------------| +| `PACKAGIST_USERNAME` | Your Packagist username | +| `PACKAGIST_TOKEN` | [packagist.org/profile](https://packagist.org/profile/) → Show API Token | +| `CODECOV_TOKEN` | Optional — Codecov project token | + +Also ensure the Packagist package `tipsyphp/tipsy` has GitHub as its repository (Auto-Update / GitHub Service Hook). + +--- + +## Every Release + +### Step 1: Commit with a release-triggering message + +Use [conventional commits](https://www.conventionalcommits.org/). Tipsy CI uses the +**`conventionalcommits` preset** (not angular), so both of these cut a **major**: + +``` +feat!: Tipsy 2.0 PHP 8.3 hard break + +# OR (always works, even on stock angular — prefer this if you want belt-and-suspenders): +feat: Tipsy 2.0 PHP 8.3 hard break + +BREAKING CHANGE: requires PHP 8.3+; default DB is PostgreSQL; typed public API. +``` + +Other bumps: + +``` +feat: add something new → minor +fix: fix a bug → patch +perf: make it faster → patch +``` + +`docs:` and `chore:` do **not** trigger a release. + +**Do not rely on PR titles alone** — semantic-release reads **git commit messages on +`master`/`main`**. If you squash-merge, put `feat!:` / `BREAKING CHANGE:` in the +**squash commit subject/body**. + +### Cutting `v2.0.0` specifically (from `0.11.x`) + +A major bump from `0.11.12` becomes **`1.0.0`**, not `2.0.0` (semver/semrel rule for +0.x). To ship Tipsy 2.0 as `v2.0.0`: + +1. Let CI open the prerelease (likely `v1.0.0`), **or** +2. Before promoting: edit the GitHub release/tag to **`v2.0.0`** (and the + `release/v…` branch name if you care), **or** +3. Create an annotated `v1.0.0` tag on the pre-2.0 tip first, then push a `feat!:` + commit so the next major is `2.0.0`. + +Then uncheck “pre-release” to publish to Packagist. + +### Step 2: Push to `master` (or `main`) + +```bash +git push origin master +``` + +Pushes to `v2` / feature branches run tests only — they do **not** create prereleases. + +### Step 3: Let CI run + +- Open **Actions** → **CI (test, coverage, release)** +- Wait for **test** (PHP 8.3/8.4 × pgsql/mysql) and **Release (prerelease branch + GitHub API)** + +If nothing releaseable: + +- Commits lacked `feat` / `fix` / `perf` / `BREAKING CHANGE` → add one and push again +- Build/test failures → fix and push again + +### Step 4: Promote the prerelease to a full release + +1. Go to **Releases** +2. Open the latest **prerelease** (e.g. `v2.0.0`) +3. **Edit** → uncheck **Set as a pre-release** → **Update release** + +This runs **Packagist release**, which pings Packagist to index the new tag. + +--- + +## Verify + +```bash +composer show tipsyphp/tipsy +# or +curl -sS https://repo.packagist.org/p2/tipsyphp/tipsy.json | jq '.packages["tipsyphp/tipsy"][0].version' +``` + +Install: + +```bash +composer require tipsyphp/tipsy:^2.0 +``` + +--- + +## Manual re-publish + +**Actions** → **Packagist release** → **Run workflow** → tag `vX.Y.Z`. diff --git a/examples/README.md b/examples/README.md new file mode 100644 index 0000000..1bd9b67 --- /dev/null +++ b/examples/README.md @@ -0,0 +1,60 @@ +# Tipsy Examples + +Working examples demonstrating core Tipsy features on modern PHP 8.3+. + +## Examples + +| Example | Description | +|---------|-------------| +| **[hello-world](hello-world/)** | Minimal app — one route, one view | +| **[rest-api](rest-api/)** | JSON REST API with GET/POST/PUT/DELETE | +| **[middleware](middleware/)** | Request logging and auth middleware | +| **[services](services/)** | Dependency injection with services | +| **[docker](docker/)** | Production Dockerfile + nginx config | +| **[vercel](vercel/)** | Serverless deploy with vercel-php community runtime | + +## Running an Example (local path repo) + +In-repo `composer.json` files use a **path** repository (`../../`) so examples track this working tree during development. + +```bash +cd examples/hello-world +# Mirror (copy) the path repo — avoids symlink loops with coverage tools +COMPOSER_MIRROR_PATH_REPOS=1 composer install +php -S localhost:8000 -t web +``` + +Then open [http://localhost:8000](http://localhost:8000). + +## Packagist / deployable apps + +After `tipsyphp/tipsy` `^2.0` is on Packagist, production apps should depend on Packagist instead of a path repo: + +```json +{ + "require": { + "php": ">=8.3", + "tipsyphp/tipsy": "^2.0" + } +} +``` + +The Vercel example’s path repository will **not** work on Vercel’s build hosts — publish/require from Packagist first, or vendor the package another way. + +## Running with Docker + +```bash +# From the repo root: +docker build -f examples/docker/Dockerfile -t tipsy-app . +docker run -p 8080:80 tipsy-app +``` + +Then open [http://localhost:8080](http://localhost:8080). + +## Deploying to Vercel + +```bash +cd examples/vercel +# Requires tipsyphp/tipsy on Packagist (or adjust composer.json) +npx vercel +``` diff --git a/examples/docker/.dockerignore b/examples/docker/.dockerignore new file mode 100644 index 0000000..3d8165c --- /dev/null +++ b/examples/docker/.dockerignore @@ -0,0 +1,3 @@ +vendor/ +.env +*.log diff --git a/examples/docker/Dockerfile b/examples/docker/Dockerfile new file mode 100644 index 0000000..dc000ae --- /dev/null +++ b/examples/docker/Dockerfile @@ -0,0 +1,73 @@ +# ============================================================================= +# Tipsy PHP — Production Docker Image +# Multi-stage build: composer install → slim runtime +# +# Build from the REPO ROOT: +# docker build -f examples/docker/Dockerfile -t tipsy-app . +# ============================================================================= + +# --- Stage 1: Install dependencies --- +FROM composer:2 AS deps + +WORKDIR /build + +# Copy the framework source first (for the path repository) +COPY src/ /tipsy/src/ +COPY composer.json /tipsy/composer.json + +# Copy the example app +COPY examples/docker/composer.json ./ + +# Point the path repository at the copied framework source +# COMPOSER_MIRROR_PATH_REPOS=1 forces a copy instead of symlink (symlinks don't survive multi-stage builds) +RUN sed -i 's|"url": "../../"|"url": "/tipsy"|' composer.json \ + && COMPOSER_MIRROR_PATH_REPOS=1 composer install --no-dev --no-scripts --prefer-dist --optimize-autoloader + +# --- Stage 2: Runtime --- +FROM php:8.3-fpm-alpine AS runtime + +# Install only what's needed — keep the image tiny +RUN apk add --no-cache nginx supervisor \ + && docker-php-ext-install pdo pdo_mysql opcache \ + && rm -rf /var/cache/apk/* + +# OPcache tuning for production +RUN { \ + echo 'opcache.enable=1'; \ + echo 'opcache.memory_consumption=128'; \ + echo 'opcache.interned_strings_buffer=16'; \ + echo 'opcache.max_accelerated_files=10000'; \ + echo 'opcache.validate_timestamps=0'; \ + echo 'opcache.jit=tracing'; \ + echo 'opcache.jit_buffer_size=64M'; \ +} > /usr/local/etc/php/conf.d/opcache.ini + +# PHP production settings +RUN { \ + echo 'expose_php=Off'; \ + echo 'display_errors=Off'; \ + echo 'log_errors=On'; \ + echo 'error_log=/dev/stderr'; \ + echo 'memory_limit=128M'; \ + echo 'upload_max_filesize=10M'; \ + echo 'post_max_size=10M'; \ +} > /usr/local/etc/php/conf.d/production.ini + +# nginx config +COPY examples/docker/docker/nginx.conf /etc/nginx/http.d/default.conf + +# supervisord to run nginx + php-fpm +COPY examples/docker/docker/supervisord.conf /etc/supervisord.conf + +# Application code +WORKDIR /var/www/app +COPY --from=deps /build/vendor ./vendor +COPY examples/docker/web ./web +COPY examples/docker/views ./views + +# Ensure nginx can read the files +RUN chown -R www-data:www-data /var/www/app + +EXPOSE 80 + +CMD ["supervisord", "-c", "/etc/supervisord.conf", "-n"] diff --git a/examples/docker/composer.json b/examples/docker/composer.json new file mode 100644 index 0000000..a0beab5 --- /dev/null +++ b/examples/docker/composer.json @@ -0,0 +1,14 @@ +{ + "name": "tipsyphp/docker-example", + "description": "Tipsy Docker deployment example", + "require": { + "tipsyphp/tipsy": "*@dev" + }, + "repositories": [ + { + "type": "path", + "url": "../../" + } + ], + "minimum-stability": "dev" +} diff --git a/examples/docker/docker/nginx.conf b/examples/docker/docker/nginx.conf new file mode 100644 index 0000000..c671f3e --- /dev/null +++ b/examples/docker/docker/nginx.conf @@ -0,0 +1,51 @@ +server { + listen 80 default_server; + server_name _; + + root /var/www/app/web; + index index.php; + + # Security headers + add_header X-Frame-Options "SAMEORIGIN" always; + add_header X-Content-Type-Options "nosniff" always; + add_header Referrer-Policy "strict-origin-when-cross-origin" always; + + # Deny access to hidden files + location ~ /\. { + deny all; + access_log off; + log_not_found off; + } + + # Static files — served directly by nginx + location ~* \.(css|js|jpg|jpeg|png|gif|ico|svg|woff2?|ttf|eot)$ { + expires 30d; + access_log off; + try_files $uri =404; + } + + # All other requests → Tipsy router + location / { + try_files $uri $uri/ /index.php?__url=$uri&$args; + } + + # PHP-FPM + location ~ \.php$ { + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include fastcgi_params; + + # Performance tuning + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + fastcgi_connect_timeout 5s; + fastcgi_send_timeout 15s; + fastcgi_read_timeout 15s; + } + + # Deny access to composer files, vendor, etc. + location ~ /(composer\.(json|lock)|vendor) { + deny all; + } +} diff --git a/examples/docker/docker/supervisord.conf b/examples/docker/docker/supervisord.conf new file mode 100644 index 0000000..1ca570d --- /dev/null +++ b/examples/docker/docker/supervisord.conf @@ -0,0 +1,23 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +loglevel=info +pidfile=/tmp/supervisord.pid + +[program:php-fpm] +command=php-fpm --nodaemonize +autostart=true +autorestart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 + +[program:nginx] +command=nginx -g "daemon off;" +autostart=true +autorestart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 diff --git a/examples/docker/views/index.phtml b/examples/docker/views/index.phtml new file mode 100644 index 0000000..f4390d7 --- /dev/null +++ b/examples/docker/views/index.phtml @@ -0,0 +1,28 @@ +
+

🍸 running

+
+
PHP Version
+
+ +
Server
+
+ +
SAPI
+
+ +
OPcache
+
+ + +
JIT
+
+ +
Cached Scripts
+
+ +
+ +
+ Health Check (JSON) +
+
diff --git a/examples/docker/views/layout.phtml b/examples/docker/views/layout.phtml new file mode 100644 index 0000000..fe48ccb --- /dev/null +++ b/examples/docker/views/layout.phtml @@ -0,0 +1,52 @@ + + + + + + <?=$title?> + + + + content?> + + diff --git a/examples/docker/web/index.php b/examples/docker/web/index.php new file mode 100644 index 0000000..3c36c60 --- /dev/null +++ b/examples/docker/web/index.php @@ -0,0 +1,42 @@ +config([ + 'view' => [ + 'path' => __DIR__ . '/../views', + ], +]); + +$app->home(function ($View) { + $View->display('index', [ + 'title' => 'Tipsy on Docker', + 'php_version' => PHP_VERSION, + 'server' => $_SERVER['SERVER_SOFTWARE'] ?? 'unknown', + 'sapi' => php_sapi_name(), + 'opcache' => function_exists('opcache_get_status') ? opcache_get_status(false) : null, + ]); +}); + +$app->get('health', function () { + header('Content-Type: application/json'); + echo json_encode([ + 'status' => 'healthy', + 'php' => PHP_VERSION, + 'memory_usage' => memory_get_usage(true), + 'peak_memory' => memory_get_peak_usage(true), + 'opcache_enabled' => function_exists('opcache_get_status'), + ]); +}); + +$app->otherwise(function () { + http_response_code(404); + header('Content-Type: application/json'); + echo json_encode(['error' => 'Not found']); +}); + +$app->start(); diff --git a/examples/hello-world/composer.json b/examples/hello-world/composer.json new file mode 100644 index 0000000..8859475 --- /dev/null +++ b/examples/hello-world/composer.json @@ -0,0 +1,14 @@ +{ + "name": "tipsyphp/hello-world-example", + "description": "Tipsy hello world example", + "require": { + "tipsyphp/tipsy": "*@dev" + }, + "repositories": [ + { + "type": "path", + "url": "../../" + } + ], + "minimum-stability": "dev" +} diff --git a/examples/hello-world/views/index.phtml b/examples/hello-world/views/index.phtml new file mode 100644 index 0000000..7b9375a --- /dev/null +++ b/examples/hello-world/views/index.phtml @@ -0,0 +1,7 @@ +

Hello, !

+

Welcome to Tipsy on PHP .

+ diff --git a/examples/hello-world/views/layout.phtml b/examples/hello-world/views/layout.phtml new file mode 100644 index 0000000..dabd891 --- /dev/null +++ b/examples/hello-world/views/layout.phtml @@ -0,0 +1,13 @@ + + + + + Hello <?=$name?> + + + + content?> + + diff --git a/examples/hello-world/web/.htaccess b/examples/hello-world/web/.htaccess new file mode 100644 index 0000000..4243213 --- /dev/null +++ b/examples/hello-world/web/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ index.php?__url=$1 [L,QSA] diff --git a/examples/hello-world/web/index.php b/examples/hello-world/web/index.php new file mode 100644 index 0000000..26cb743 --- /dev/null +++ b/examples/hello-world/web/index.php @@ -0,0 +1,40 @@ +config([ + 'view' => [ + 'path' => __DIR__ . '/../views', + ], +]); + +// Home page — renders a view with a variable +$app->home(function ($View) { + $View->display('index', ['name' => 'World']); +}); + +// Dynamic route with a parameter +$app->get('hello/:name', function ($Params, $View) { + $View->display('index', ['name' => ucfirst($Params->name)]); +}); + +// JSON endpoint +$app->get('api/status', function () { + header('Content-Type: application/json'); + echo json_encode([ + 'status' => 'ok', + 'php' => PHP_VERSION, + 'framework' => 'Tipsy', + ]); +}); + +$app->otherwise(function () { + http_response_code(404); + echo '

404 — Not Found

'; +}); + +$app->start(); diff --git a/examples/middleware/composer.json b/examples/middleware/composer.json new file mode 100644 index 0000000..8b9dd03 --- /dev/null +++ b/examples/middleware/composer.json @@ -0,0 +1,14 @@ +{ + "name": "tipsyphp/middleware-example", + "description": "Tipsy middleware example", + "require": { + "tipsyphp/tipsy": "*@dev" + }, + "repositories": [ + { + "type": "path", + "url": "../../" + } + ], + "minimum-stability": "dev" +} diff --git a/examples/middleware/web/.htaccess b/examples/middleware/web/.htaccess new file mode 100644 index 0000000..4243213 --- /dev/null +++ b/examples/middleware/web/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ index.php?__url=$1 [L,QSA] diff --git a/examples/middleware/web/index.php b/examples/middleware/web/index.php new file mode 100644 index 0000000..effcbb6 --- /dev/null +++ b/examples/middleware/web/index.php @@ -0,0 +1,83 @@ +middleware(function ($Request) { + return [ + 'run' => function () use ($Request): void { + $time = date('Y-m-d H:i:s'); + $method = $Request->method(); + $path = $Request->path(); + error_log("[{$time}] {$method} /{$path}"); + } + ]; +}); + +// --- Middleware 2: CORS Headers --- +// Adds CORS headers to every response +$app->middleware(function () { + return [ + 'run' => function (): void { + header('Access-Control-Allow-Origin: *'); + header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE, OPTIONS'); + header('Access-Control-Allow-Headers: Content-Type, Authorization'); + } + ]; +}); + +// --- Middleware 3: Auth Guard (class-based) --- +class AuthMiddleware extends Tipsy\Middleware { + public function run(mixed $args = null): mixed { + // Check for a Bearer token in the Authorization header + $headers = getallheaders(); + $auth = $headers['Authorization'] ?? ''; + + if (str_starts_with($auth, 'Bearer ')) { + $token = substr($auth, 7); + // In a real app, validate the token here + $this->user = ['id' => 1, 'name' => 'Admin', 'token' => $token]; + } else { + $this->user = null; + } + + return true; + } +} + +$app->middleware('Auth', AuthMiddleware::class); + +// --- Routes --- + +$app->get('public', function () { + header('Content-Type: application/json'); + echo json_encode(['message' => 'This is public — no auth needed']); +}); + +$app->get('protected', function ($Auth) { + header('Content-Type: application/json'); + + if (!$Auth->user) { + http_response_code(401); + echo json_encode(['error' => 'Unauthorized — send Authorization: Bearer ']); + return; + } + + echo json_encode([ + 'message' => 'Welcome, ' . $Auth->user['name'], + 'user' => $Auth->user, + ]); +}); + +$app->otherwise(function () { + http_response_code(404); + header('Content-Type: application/json'); + echo json_encode(['error' => 'Not found']); +}); + +$app->start(); diff --git a/examples/rest-api/composer.json b/examples/rest-api/composer.json new file mode 100644 index 0000000..08f9d8f --- /dev/null +++ b/examples/rest-api/composer.json @@ -0,0 +1,14 @@ +{ + "name": "tipsyphp/rest-api-example", + "description": "Tipsy REST API example", + "require": { + "tipsyphp/tipsy": "*@dev" + }, + "repositories": [ + { + "type": "path", + "url": "../../" + } + ], + "minimum-stability": "dev" +} diff --git a/examples/rest-api/web/.htaccess b/examples/rest-api/web/.htaccess new file mode 100644 index 0000000..4243213 --- /dev/null +++ b/examples/rest-api/web/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ index.php?__url=$1 [L,QSA] diff --git a/examples/rest-api/web/index.php b/examples/rest-api/web/index.php new file mode 100644 index 0000000..5f9c22e --- /dev/null +++ b/examples/rest-api/web/index.php @@ -0,0 +1,92 @@ + 1, 'name' => 'Espresso', 'price' => 3.50], + ['id' => 2, 'name' => 'Latte', 'price' => 4.75], + ['id' => 3, 'name' => 'Americano', 'price' => 3.00], +]; + +// Helper to send JSON responses +function json_response(mixed $data, int $status = 200): void { + http_response_code($status); + header('Content-Type: application/json; charset=utf-8'); + echo json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE); +} + +// List all items +$app->get('items', function () use (&$items) { + json_response(['data' => $items]); +}); + +// Get a single item by ID +$app->get('items/:id', function ($Params) use (&$items) { + $id = (int) $Params->id; + foreach ($items as $item) { + if ($item['id'] === $id) { + json_response(['data' => $item]); + return; + } + } + json_response(['error' => 'Item not found'], 404); +}); + +// Create a new item +$app->post('items', function ($Request) use (&$items) { + $body = $Request->request(); + if (empty($body['name'])) { + json_response(['error' => 'Name is required'], 422); + return; + } + + $newItem = [ + 'id' => max(array_column($items, 'id')) + 1, + 'name' => $body['name'], + 'price' => (float) ($body['price'] ?? 0), + ]; + $items[] = $newItem; + + json_response(['data' => $newItem], 201); +}); + +// Update an item +$app->put('items/:id', function ($Params, $Request) use (&$items) { + $id = (int) $Params->id; + $body = $Request->request(); + + foreach ($items as &$item) { + if ($item['id'] === $id) { + $item['name'] = $body['name'] ?? $item['name']; + $item['price'] = isset($body['price']) ? (float) $body['price'] : $item['price']; + json_response(['data' => $item]); + return; + } + } + json_response(['error' => 'Item not found'], 404); +}); + +// Delete an item +$app->delete('items/:id', function ($Params) use (&$items) { + $id = (int) $Params->id; + foreach ($items as $key => $item) { + if ($item['id'] === $id) { + unset($items[$key]); + json_response(['deleted' => true]); + return; + } + } + json_response(['error' => 'Item not found'], 404); +}); + +// Catch-all +$app->otherwise(function () { + json_response(['error' => 'Not found'], 404); +}); + +$app->start(); diff --git a/examples/services/composer.json b/examples/services/composer.json new file mode 100644 index 0000000..79fdf33 --- /dev/null +++ b/examples/services/composer.json @@ -0,0 +1,14 @@ +{ + "name": "tipsyphp/services-example", + "description": "Tipsy dependency injection example", + "require": { + "tipsyphp/tipsy": "*@dev" + }, + "repositories": [ + { + "type": "path", + "url": "../../" + } + ], + "minimum-stability": "dev" +} diff --git a/examples/services/web/.htaccess b/examples/services/web/.htaccess new file mode 100644 index 0000000..4243213 --- /dev/null +++ b/examples/services/web/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine On +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule ^(.*)$ index.php?__url=$1 [L,QSA] diff --git a/examples/services/web/index.php b/examples/services/web/index.php new file mode 100644 index 0000000..460d0fe --- /dev/null +++ b/examples/services/web/index.php @@ -0,0 +1,86 @@ +service('Config', function () { + return [ + 'app_name' => 'Tipsy Demo', + 'version' => '2.0.0', + 'debug' => true, + ]; +}); + +// --- Service 2: Logger service (class-based) --- +class Logger extends Tipsy\Service { + private array $logs = []; + + public function log(string $level, string $message): void { + $this->logs[] = [ + 'time' => date('c'), + 'level' => $level, + 'message' => $message, + ]; + if ($level === 'error') { + error_log("[{$level}] {$message}"); + } + } + + public function getLogs(): array { + return $this->logs; + } +} + +$app->service('Logger', Logger::class); + +// --- Service 3: Greeter (depends on Config) --- +// Demonstrates service-to-service dependency via closure injection. +// Injected services are Tipsy\Service objects — use property access, not array keys. +$app->service('Greeter', function ($Config) { + return [ + 'greet' => function (string $name) use ($Config): string { + return "Hello {$name}, welcome to {$Config->app_name} v{$Config->version}!"; + } + ]; +}); + +// --- Routes that consume services --- + +$app->home(function ($Greeter) { + header('Content-Type: application/json'); + echo json_encode([ + 'greeting' => $Greeter->greet('World'), + ]); +}); + +$app->get('info', function ($Config, $Logger) { + $Logger->log('info', 'Info endpoint hit'); + + header('Content-Type: application/json'); + echo json_encode([ + 'config' => $Config, + 'logs' => $Logger->getLogs(), + ]); +}); + +$app->get('greet/:name', function ($Params, $Greeter, $Logger) { + $Logger->log('info', "Greeting {$Params->name}"); + + header('Content-Type: application/json'); + echo json_encode([ + 'greeting' => $Greeter->greet($Params->name), + ]); +}); + +$app->otherwise(function () { + http_response_code(404); + header('Content-Type: application/json'); + echo json_encode(['error' => 'Not found']); +}); + +$app->start(); diff --git a/examples/vercel/README.md b/examples/vercel/README.md new file mode 100644 index 0000000..adb5a8a --- /dev/null +++ b/examples/vercel/README.md @@ -0,0 +1,59 @@ +# Tipsy on Vercel + +Deploy Tipsy as a serverless PHP function using the [vercel-php](https://github.com/vercel-community/php) community runtime. + +## Packagist requirement + +The example `composer.json` uses a **path** repository for local monorepo development. Vercel builds **cannot** resolve that path. Before deploying: + +1. Publish `tipsyphp/tipsy` `^2.0` to Packagist (or a VCS repo Vercel can reach), then +2. Replace the path repository with a normal constraint: + +```json +{ + "require": { + "php": ">=8.3", + "tipsyphp/tipsy": "^2.0" + } +} +``` + +## Deploy + +```bash +# Install Vercel CLI +npm i -g vercel + +# Deploy (after Packagist require is in place) +cd examples/vercel +vercel +``` + +## Local Development + +```bash +cd examples/vercel +composer install +php -S localhost:8000 -t api +``` + +## How It Works + +``` +vercel.json → routes all requests to api/index.php +api/index.php → Tipsy entry point (handles all routing) +composer.json → vercel-php installs deps automatically during build +``` + +Vercel spins up a serverless function per request. Tipsy's low overhead +(sub-millisecond bootstrap) makes it a good fit for cold starts. + +## Endpoints + +| Route | Method | Description | +|-------|--------|-------------| +| `/` | GET | API info + available routes | +| `/hello/:name` | GET | Greeting with route param | +| `/time` | GET | Current UTC time | +| `/echo` | POST | Echoes back your JSON body | +| `/health` | GET | Health check | diff --git a/examples/vercel/api/index.php b/examples/vercel/api/index.php new file mode 100644 index 0000000..a7f6298 --- /dev/null +++ b/examples/vercel/api/index.php @@ -0,0 +1,68 @@ +home(function () { + header('Content-Type: application/json'); + echo json_encode([ + 'framework' => 'Tipsy', + 'runtime' => 'vercel-php', + 'php' => PHP_VERSION, + 'region' => $_SERVER['VERCEL_REGION'] ?? 'local', + 'routes' => [ + 'GET /' => 'This info page', + 'GET /hello/:name' => 'Greeting with route param', + 'GET /time' => 'Current server time', + 'POST /echo' => 'Echoes back your JSON body', + 'GET /health' => 'Health check', + ], + ], JSON_PRETTY_PRINT); +}); + +$app->get('hello/:name', function ($Params) { + header('Content-Type: application/json'); + echo json_encode([ + 'greeting' => 'Hello, ' . ucfirst($Params->name) . '!', + 'region' => $_SERVER['VERCEL_REGION'] ?? 'local', + ]); +}); + +$app->get('time', function () { + header('Content-Type: application/json'); + echo json_encode([ + 'utc' => gmdate('c'), + 'timestamp' => time(), + ]); +}); + +$app->post('echo', function ($Request) { + header('Content-Type: application/json'); + echo json_encode([ + 'method' => $Request->method(), + 'body' => $Request->request(), + ]); +}); + +$app->get('health', function () { + header('Content-Type: application/json'); + echo json_encode([ + 'status' => 'ok', + 'php' => PHP_VERSION, + 'memory' => memory_get_usage(true), + 'sapi' => php_sapi_name(), + ]); +}); + +$app->otherwise(function () { + http_response_code(404); + header('Content-Type: application/json'); + echo json_encode(['error' => 'Not found']); +}); + +$app->start(); diff --git a/examples/vercel/composer.json b/examples/vercel/composer.json new file mode 100644 index 0000000..41d9d0d --- /dev/null +++ b/examples/vercel/composer.json @@ -0,0 +1,14 @@ +{ + "name": "tipsyphp/vercel-example", + "description": "Tipsy deployed on Vercel with vercel-php community runtime", + "require": { + "tipsyphp/tipsy": "*@dev" + }, + "repositories": [ + { + "type": "path", + "url": "../../" + } + ], + "minimum-stability": "dev" +} diff --git a/examples/vercel/vercel.json b/examples/vercel/vercel.json new file mode 100644 index 0000000..0acb5a8 --- /dev/null +++ b/examples/vercel/vercel.json @@ -0,0 +1,11 @@ +{ + "functions": { + "api/*.php": { + "runtime": "vercel-php@0.9.0" + } + }, + "routes": [ + { "src": "/api/(.*)", "dest": "/api/index.php" }, + { "src": "/(.*)", "dest": "/api/index.php" } + ] +} diff --git a/release.config.cjs b/release.config.cjs new file mode 100644 index 0000000..ecca92f --- /dev/null +++ b/release.config.cjs @@ -0,0 +1,34 @@ +/** + * Semantic-release config (cosmiconfig name: "release"). + * + * Full plugin list lives in `release.full.config.json` (not auto-discovered as .releaserc). + * + * - TIPSY_SEMANTIC_RELEASE_CI=1: file:// repo + analyzer only (CI dry-runs, no git push). + * - Otherwise: full config (GitHub plugin, real remote). + * + * Use preset "conventionalcommits" (NOT angular). Stock angular does not understand + * `feat!:` / `fix!:` — those headers parse as no-type and produce no release. The + * conventionalcommits preset supports the `!` breaking shorthand natively. The footer + * form `BREAKING CHANGE: ...` also works on both presets and is the safest major trigger. + */ +const path = require("path"); +const { execSync } = require("child_process"); + +const full = require(path.join(__dirname, "release.full.config.json")); + +function readOnlyCi() { + const root = execSync("git rev-parse --show-toplevel", { encoding: "utf8" }).trim(); + const fileUrl = "file://" + root.replace(/\\/g, "/") + "/.git"; + const pick = (name) => full.plugins.find((p) => Array.isArray(p) && p[0] === name); + return { + branches: full.branches, + repositoryUrl: fileUrl, + plugins: [ + pick("@semantic-release/commit-analyzer"), + pick("@semantic-release/release-notes-generator"), + ], + }; +} + +module.exports = + process.env.TIPSY_SEMANTIC_RELEASE_CI === "1" ? readOnlyCi() : full; diff --git a/release.full.config.json b/release.full.config.json new file mode 100644 index 0000000..b7ea4e7 --- /dev/null +++ b/release.full.config.json @@ -0,0 +1,13 @@ +{ + "branches": ["master", "main"], + "plugins": [ + ["@semantic-release/commit-analyzer", { + "preset": "conventionalcommits" + }], + ["@semantic-release/release-notes-generator", { + "preset": "conventionalcommits" + }], + ["@semantic-release/npm", { "npmPublish": false }], + ["@semantic-release/github", {}] + ] +} diff --git a/src/App.php b/src/App.php index 3f9407a..3f42504 100644 --- a/src/App.php +++ b/src/App.php @@ -1,37 +1,38 @@ */ + private array $_controllers = []; + private array $_config = []; + /** @var array */ + private array $_services = []; + private array $_middlewares = []; + private bool $_middlewareStart = false; + private ?Route $_route = null; + private ?string $_url = null; + private ?Router $_router = null; + private ?Db $_db = null; + private ?View $_view = null; + private ?Request $_request = null; + private ?Factory $_factory = null; + private Scope $_rootScope; public function __construct() { - $this->_controllers = []; - $this->_middlewares = []; - $this->_config = []; - $this->_services = []; - $this->_services = []; - $this->_rootScope = new Scope; - $this->_middlewareStart = false; - - $this->_id = sha1(rand(1,900000)); + $this->_rootScope = new Scope(); } - public function run($url = null) { - return $this->start($url); + public function run(?string $url = null): void { + $this->start($url); } - public function start($url = null) { + public function start(?string $url = null): void { $this->_url = $this->request()->path($url); $this->_route = $this->router()->match($this->_url); $this->_middlewareStart = true; @@ -45,13 +46,15 @@ public function start($url = null) { $this->_route->controller()->init(); } - public function router() { - if (!isset($this->_router)) { + + public function router(): Router { + if ($this->_router === null) { $this->_router = new Router(['tipsy' => $this]); } return $this->_router; } - public function controller($controller, $closure = null) { + + public function controller(?string $controller = null, ?callable $closure = null): static|Controller|null { if ($controller && is_callable($closure)) { $this->_controllers[$controller] = new Controller([ 'closure' => $closure, @@ -60,32 +63,32 @@ public function controller($controller, $closure = null) { return $this; } elseif ($controller) { - return $this->_controllers[$controller]; + return $this->_controllers[$controller] ?? null; } else { return null; } } - public function config($args = null, $recursive = 0) { - if ($recursive === 2) { - $merge = 'array_merge'; - } elseif($recursive == 1) { - $merge = 'array_merge_recursive'; - } else { - $merge = 'array_replace_recursive'; - } + + public function config(string|array|null $args = null, int|bool $recursive = 0): static|array { + $recursive = (int) $recursive; + $merge = match ($recursive) { + 2 => 'array_merge', + 1 => 'array_merge_recursive', + default => 'array_replace_recursive', + }; if (is_string($args)) { $iterator = new \GlobIterator($args); - foreach($iterator as $file) { - if ($file->getExtension() == 'ini') { + foreach ($iterator as $file) { + if ($file->getExtension() === 'ini') { $config = parse_ini_file($file->getPathname(), true); - } elseif ($file->getExtension() == 'yaml' || $file->getExtension() == 'yml') { + } elseif ($file->getExtension() === 'yaml' || $file->getExtension() === 'yml') { if (function_exists('yaml_parse_file')) { $config = yaml_parse_file($file->getPathname()); - } elseif (class_exists('\Symfony\Component\Yaml\Parser')) { + } elseif (class_exists('\\Symfony\\Component\\Yaml\\Parser')) { $yaml = new \Symfony\Component\Yaml\Parser(); $config = $yaml->parse(file_get_contents($file->getPathname())); } else { @@ -93,10 +96,10 @@ public function config($args = null, $recursive = 0) { } } else { - throw new Exception('Unknown file type: "'.$file->getFileName().'"'); + throw new Exception('Unknown file type: "' . $file->getFileName() . '"'); } - $this->_config = $merge($this->_config, $config); + $this->_config = $merge($this->_config, $config); } return $this; @@ -110,13 +113,13 @@ public function config($args = null, $recursive = 0) { } } - public function service($service, $args = null, $static = false) { - list($service, $extend) = $this->_serviceName($service, $args); + public function service(string $service, mixed $args = null, bool $static = false): object { + [$service, $extend] = $this->_serviceName($service, $args); - if (!$this->_services[$service]) { + if (!isset($this->_services[$service]) || !$this->_services[$service]) { if (is_object($args) && !is_callable($args) && !$args instanceof Service) { - throw new Exception('Service must be an instace of Tipsy\Service'); + throw new Exception('Service must be an instance of Tipsy\\Service'); } elseif ($service && is_callable($args)) { $config = ['_controller' => new Service([ @@ -124,15 +127,15 @@ public function service($service, $args = null, $static = false) { 'tipsy' => $this ])]; - } elseif ($service && (class_exists($service) || (!is_array($args) && (is_object($args) || class_exists($args))))) { + } elseif ($service && (class_exists($service) || (!is_array($args) && (is_object($args) || (is_string($args) && class_exists($args)))))) { $class = is_object($args) ? $args : ((is_string($args) && class_exists($args)) ? $args : $service); $extend = $class; } elseif ($service && is_array($args)) { - $config = $args ? $args : []; + $config = $args ?: []; } - if (is_string($extend) && $this->_services[$extend]) { + if (is_string($extend) && isset($this->_services[$extend])) { $extend = $this->_services[$extend]; } @@ -140,38 +143,49 @@ public function service($service, $args = null, $static = false) { $config['_static'] = true; } - $name = $extend ? $extend : 'Tipsy\Service'; - //$name = ($extend && !is_null($args)) ? $extend : 'Tipsy\Service'; + $name = $extend ?: 'Tipsy\\Service'; $config['_service'] = $service; $this->_services[$service] = [ 'reflection' => new \ReflectionClass($name), - 'config' => $config + 'config' => $config ?? [] ]; return $this; } else { - if ($this->_services[$service]['config']['_controller']) { + if (isset($this->_services[$service]['config']['_controller']) && $this->_services[$service]['config']['_controller']) { $this->_services[$service]['config'] = $this->_services[$service]['config']['_controller']->init(['tipsy' => $this]); } - if ($this->_services[$service]['config']['_static'] && $this->_services[$service]['instance']) { + if (!empty($this->_services[$service]['config']['_static']) && isset($this->_services[$service]['instance'])) { return $this->_services[$service]['instance']; } if ($this->_services[$service]['reflection']->hasMethod('__construct')) { - $config = array_merge(is_array($this->_services[$service]['config']) ? $this->_services[$service]['config'] : [],['_tipsy' => $this],$args ? $args : []); + $config = array_merge( + is_array($this->_services[$service]['config']) ? $this->_services[$service]['config'] : [], + ['_tipsy' => $this], + $args ? (is_array($args) ? $args : []) : [] + ); $instance = $this->_services[$service]['reflection']->newInstance($config); } else { $instance = $this->_services[$service]['reflection']->newInstance(); } + if (method_exists($instance, 'tipsy')) { + $instance->tipsy($this); + } + if (is_array($this->_services[$service]['config'])) { foreach ($this->_services[$service]['config'] as $name => $config) { + // Skip internal service metadata (_service, _static, _tipsy, _controller, …) + if (is_string($name) && str_starts_with($name, '_')) { + continue; + } if (is_callable($config) && method_exists($instance, 'addMethod')) { $instance->addMethod($name, $config); } else { @@ -181,26 +195,28 @@ public function service($service, $args = null, $static = false) { } } - if ($this->_services[$service]['config']['_static']) { + if (!empty($this->_services[$service]['config']['_static'])) { $this->_services[$service]['instance'] = $instance; } return $instance; } } - public function services($service = null) { + + public function services(?string $service = null): array|bool { if ($service) { - return $this->_services[$service] ? true : false; + return isset($this->_services[$service]) && $this->_services[$service] ? true : false; } return $this->_services; } - public function db() { - if (!isset($this->_db)) { + + public function db(): Db { + if ($this->_db === null) { if ($this->services('Db')) { $this->_db = $this->service('Db'); $this->_db->connect($this->_config['db']); } else { - $this->_db = new Db($this->_config['db']); + $this->_db = new Db($this->_config['db'] ?? null); } // kill the db config in case something gets outputted @@ -209,63 +225,72 @@ public function db() { return $this->_db; } - public function view() { - if (!isset($this->_view)) { - $config = $this->_config['view']; + + public function view(): View { + if ($this->_view === null) { + $config = $this->_config['view'] ?? []; $config['tipsy'] = $this; $this->_view = new View($config); } return $this->_view; } - public function request() { - if (!isset($this->_request)) { - $this->_request = new Request; + + public function request(): Request { + if ($this->_request === null) { + $this->_request = new Request(); } return $this->_request; } - private function _serviceName($service, $args = null) { - if (strpos($service, '/')) {//!is_null($args) && - $service = explode('/',$service); - if (count($service) > 2) { + private function _serviceName(string $service, mixed $args = null): array { + $extend = null; + + if (str_contains($service, '/')) { + $parts = explode('/', $service); + if (count($parts) > 2) { throw new Exception('Cant extend more than one model.'); - } elseif (count($service) > 1) { - $extend = array_shift($service); + } elseif (count($parts) > 1) { + $extend = array_shift($parts); } - $service = array_shift($service); + $service = array_shift($parts); } elseif ($args === null) { $extend = $service; - $service = explode('\\', $service); - $service = array_pop($service); + $parts = explode('\\', $service); + $service = array_pop($parts); } return [$service, $extend]; } - public function rootScope() { + public function rootScope(): Scope { return $this->_rootScope; } - public function route() { + + public function route(?Route $route = null): ?Route { + if ($route !== null) { + $this->_route = $route; + } return $this->_route; } - public function url() { + + public function url(): ?string { return $this->_url; } - public function middleware($service, $args = []) { + public function middleware(string|array|callable|object $service, mixed $args = []): object { if (!is_string($service)) { $args = $service; $service = uniqid(); } if (is_object($args) && !is_callable($args) && !$args instanceof Middleware) { - throw new Exception('Middleware must be an instace of Tipsy\Middleware'); + throw new Exception('Middleware must be an instance of Tipsy\\Middleware'); } - if (!$this->_services[$service]) { + if (!isset($this->_services[$service]) || !$this->_services[$service]) { $this->service($service, $args, true); } - if ($this->_middlewares[$service]) { + if (isset($this->_middlewares[$service]) && $this->_middlewares[$service]) { return $this->service($service); } $middleware = [ @@ -280,23 +305,23 @@ public function middleware($service, $args = []) { return $this->service($service); } - public function middlewares() { + public function middlewares(): array { return $this->_middlewares; } - public function factoryCount() { - return $this->_factory->count(); + public function factoryCount(): int { + return $this->_factory?->count() ?? 0; } - public function factory($a = null, $b = null) { - if (!$this->_factory) { + public function factory(mixed $a = null, mixed $b = null): mixed { + if ($this->_factory === null) { $this->_factory = new Factory($this); } - return $this->_factory->objectMap($a,$b); + return $this->_factory->objectMap($a, $b); } - public function __call($method, $args) { - return call_user_func_array([$this->router(), $method], $args); + public function __call(string $method, array $args): mixed { + return $this->router()->$method(...$args); } } diff --git a/src/Controller.php b/src/Controller.php index 6a3f25f..a11e594 100644 --- a/src/Controller.php +++ b/src/Controller.php @@ -1,26 +1,33 @@ _scope = new Scope; - $this->_tipsy = $args['tipsy']; + $this->_scope = new Scope(); + if (isset($args['tipsy'])) { + $this->_tipsy = $args['tipsy']; + } } - public function init($args = []) { + + public function init(array $args = []): mixed { $this->tipsy()->view()->scope($this->_scope); if ($this->closure()) { return $this->inject($this->closure()); } + return null; } - public function inject($closure, $scope = null) { + + public function inject(\Closure $closure, ?Scope $scope = null): mixed { return parent::inject($closure, $this->_scope); } } diff --git a/src/Db.php b/src/Db.php index 234a518..c18de71 100644 --- a/src/Db.php +++ b/src/Db.php @@ -1,31 +1,37 @@ tipsy($config['_tipsy']); return; } - $this->connect($config); + if ($config !== null) { + $this->connect($config); + } } - public function parseUrl($url) { - $url = parse_url($url); + public function parseUrl(string $url): array { + $parsed = parse_url($url); $args = []; - $args['driver'] = $url['scheme']; - $args['user'] = $url['user']; - $args['pass'] = $url['pass']; - $args['host'] = $url['host']; - $args['port'] = $url['port']; - $args['database'] = substr($url['path'], 1); - parse_str($url['query'], $args['options']); + $args['driver'] = $parsed['scheme'] ?? ''; + $args['user'] = $parsed['user'] ?? ''; + $args['pass'] = $parsed['pass'] ?? ''; + $args['host'] = $parsed['host'] ?? ''; + $args['port'] = $parsed['port'] ?? null; + $args['database'] = substr($parsed['path'] ?? '', 1); + parse_str($parsed['query'] ?? '', $args['options']); - if ($args['options'] && is_array($args['options'])) { + if (!empty($args['options']) && is_array($args['options'])) { foreach ($args['options'] as $key => $value) { $args[$key] = $value; } @@ -34,95 +40,117 @@ public function parseUrl($url) { return $args; } - public function connect($args = null) { - if (!$args) { + public function connect(array $args): static { + if (empty($args)) { throw new \Exception('Invalid DB config.'); } $options = []; // will overwrite any existing args - if ($args['url']) { + if (!empty($args['url'])) { $args = array_merge($this->parseUrl($args['url']), $args); } - if ($args['persistent']) { + if (!empty($args['persistent'])) { $options[\PDO::ATTR_PERSISTENT] = true; } - if ($args['sslca']) { + if (!empty($args['sslca'])) { $options[\PDO::MYSQL_ATTR_SSL_CA] = $args['sslca']; $options[\PDO::ATTR_TIMEOUT] = 4; $options[\PDO::ATTR_ERRMODE] = \PDO::ERRMODE_EXCEPTION; } - if (!$args['driver']) { - $args['driver'] = 'mysql'; - } - - if ($args['driver'] == 'postgres') { + if (empty($args['driver'])) { $args['driver'] = 'pgsql'; } - if ($args['driver'] == 'mysql') { + $args['driver'] = match ($args['driver']) { + 'postgres', 'postgresql' => 'pgsql', + default => $args['driver'], + }; + + if ($args['driver'] === 'mysql') { $args['charset'] = 'utf8'; } - if (!$args['dsn']) { - $args['dsn'] = $args['driver'].':host='.$args['host'].($args['port'] ? ';port='.$args['port'] : '').';dbname='.$args['database'].($args['charset'] ? ';charset='.$args['charset'] : ''); + if (empty($args['dsn'])) { + if ($args['driver'] === 'sqlite') { + $path = $args['path'] ?? $args['database'] ?? ':memory:'; + $args['dsn'] = 'sqlite:' . $path; + } else { + $args['dsn'] = $args['driver'] . ':host=' . ($args['host'] ?? '127.0.0.1') + . (!empty($args['port']) ? ';port=' . $args['port'] : '') + . ';dbname=' . ($args['database'] ?? '') + . (!empty($args['charset']) ? ';charset=' . $args['charset'] : ''); + } } - $db = new \PDO($args['dsn'], $args['user'], $args['pass'], $options); + $db = new \PDO($args['dsn'], $args['user'] ?? '', $args['pass'] ?? '', $options); $this->_driver = $db->getAttribute(\PDO::ATTR_DRIVER_NAME); $db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); - $db->setAttribute(\PDO::ATTR_EMULATE_PREPARES, $args['sslca'] ? true : false); + $db->setAttribute(\PDO::ATTR_EMULATE_PREPARES, !empty($args['sslca'])); + // Set default fetch mode once at connection time — avoids per-query overhead + $db->setAttribute(\PDO::ATTR_DEFAULT_FETCH_MODE, \PDO::FETCH_OBJ); $this->db($db); return $this; } - public function exec($query) { + public function exec(string $query): int|false { return $this->db()->exec($query); } - public function query($query, $args = null) { - $stmt = $this->db()->prepare($query); - if ($args) { - $stmt->execute($args); - } else { - $stmt->execute(); + public function query(string $query, ?array $args = null): \PDOStatement { + $pdo = $this->db(); + if ($pdo === null) { + throw new Exception('Database is not connected.'); } + $stmt = $pdo->prepare($query); + $stmt->execute($args ?? []); return $stmt; } - public function get($query, $args = null, $type = 'object') { + public function get(string $query, ?array $args = null, string $type = 'object'): array { $stmt = $this->query($query, $args); - return $stmt->fetchAll($type == 'object' ? \PDO::FETCH_OBJ : \PDO::FETCH_ASSOC); + return $stmt->fetchAll($type === 'object' ? \PDO::FETCH_OBJ : \PDO::FETCH_ASSOC); } - public function db($db = null) { - if (!is_null($db)) { + public function db(?\PDO $db = null): ?\PDO { + if ($db !== null) { $this->_db = $db; } return $this->_db; } - public function fields($table, $fields = null) { - if ($table && $fields) { + public function fields(?string $table = null, ?array $fields = null): ?array { + if ($table !== null && $fields !== null) { $this->_fields[$table] = $fields; } - return $this->_fields[$table]; + return $this->_fields[$table] ?? null; } - public function driver() { + public function driver(): ?string { return $this->_driver; } - public function tipsy($tipsy = null) { - if (!is_null($tipsy)) { + /** + * Quote an SQL identifier for the active driver. + * Postgres/SQLite use double quotes; MySQL uses backticks. + */ + public function quoteIdent(string $name): string { + return match ($this->_driver) { + 'mysql' => '`' . str_replace('`', '``', $name) . '`', + default => '"' . str_replace('"', '""', $name) . '"', + }; + } + + public function tipsy(?App $tipsy = null): ?App { + if ($tipsy !== null) { $this->_tipsy = $tipsy; } - return $this->_tipsy; + return $this->_tipsy ?? null; } } diff --git a/src/Db/MysqlToPgsql.php b/src/Db/MysqlToPgsql.php index 6b61b83..fc2fe53 100644 --- a/src/Db/MysqlToPgsql.php +++ b/src/Db/MysqlToPgsql.php @@ -1,56 +1,67 @@ service('Db', Tipsy\Db\MysqlToPgsql::class); + */ class MysqlToPgsql extends \Tipsy\Db { - public static function convert(&$query, &$args = []) { + public static function convert(string &$query, array &$args = []): array { // replace backticks - $query = str_replace('`','"', $query); + $query = str_replace('`', '"', $query); // replace add single quotes to interval statements - $query = preg_replace('/(interval) ([0-9]+) ([a-z]+)/i','\\1 \'\\2 \\3\'', $query); + $query = preg_replace('/(interval) ([0-9]+) ([a-z]+)/i', '\\1 \'\\2 \\3\'', $query) ?? $query; // replace unix_timestamp - $query = preg_replace('/unix_timestamp( )?\((.*?)\)/i','extract(epoch FROM \\2)', $query); + $query = preg_replace('/unix_timestamp( )?\((.*?)\)/i', 'extract(epoch FROM \\2)', $query) ?? $query; // replace date_sub - $query = preg_replace('/(date_sub\((.*?),(.*?))\)/i','\\2 - \\3', $query); + $query = preg_replace('/(date_sub\((.*?),(.*?))\)/i', '\\2 - \\3', $query) ?? $query; // replace date formats - $query = preg_replace_callback('/date_format\(( )?(.*?),( )?("(.*?)"|\'(.*?)\')( )?\)/i',function($m) { + $query = preg_replace_callback('/date_format\(( )?(.*?),( )?("(.*?)"|\\\'(.*?)\\\')( )?\)/i', function(array $m): string { $find = ['/\%Y/', '/\%m/', '/\%d/', '/\%H/', '/\%i/', '/\%s/', '/\%W/']; $replace = ['YYYY', 'MM', 'DD', 'HH24', 'MI', 'SS', 'D']; - $format = preg_replace($find, $replace, $m[6] ? $m[6] : $m[5]); - return 'to_char('.$m[2].', \''.$format.'\')'; - }, $query); - - - if ($args) { - foreach ($args as $k => $v) { - if ($v === true) { - $args[$k] = 'true'; - } elseif ($v === false) { - $args[$k] = 'false'; - } + $format = preg_replace($find, $replace, $m[6] ?: $m[5]); + return 'to_char(' . $m[2] . ', \'' . $format . '\')'; + }, $query) ?? $query; + + + foreach ($args as $k => $v) { + if ($v === true) { + $args[$k] = 'true'; + } elseif ($v === false) { + $args[$k] = 'false'; } } - return [query => $query, args => $args]; + + return ['query' => $query, 'args' => $args]; } - public function query($query, $args = []) { + public function query(string $query, ?array $args = null): \PDOStatement { if (!$query) { - throw new \Tipsy\Exception('Query is emtpy'); + throw new \Tipsy\Exception('Query is empty'); } - self::convert($query, $args); + $argsRef = $args ?? []; + self::convert($query, $argsRef); if (!$query) { - throw new \Tipsy\Exception('mysqlToPgsql Query is emtpy'); + throw new \Tipsy\Exception('mysqlToPgsql Query is empty'); } - return parent::query($query, $args); + return parent::query($query, $argsRef); } - public function exec($query) { - self::convert($query); + public function exec(string $query): int|false { + $args = []; + self::convert($query, $args); return parent::exec($query); } } diff --git a/src/DependencyInjector.php b/src/DependencyInjector.php index 791660b..6358b57 100644 --- a/src/DependencyInjector.php +++ b/src/DependencyInjector.php @@ -1,80 +1,81 @@ + */ + private static array $_reflectionCache = []; - public function __construct($args = []) { + public function __construct(array $args = []) { if (isset($args['tipsy'])) { $this->tipsy($args['tipsy']); } if (isset($args['closure'])) { - $this->closure(\Closure::bind($args['closure'], $this, get_class())); + $this->closure(\Closure::bind($args['closure'], $this, static::class)); } } - public function service($name) { - return $this->_getDependency($name, $this->_scope); + + public function service(string $name): mixed { + return $this->_getDependency($name, $this->_scope ?? null); } - private function _getDependency($name, $scope = null) { - if ($this->tipsy()->services($name) && $name != 'Db') { - return $this->tipsy()->service($name); - } else { - switch ($name) { - case 'Db': - return $this->tipsy()->db(); - case 'Route': - return $this->tipsy()->route(); - case 'Request': - return $this->tipsy()->request(); - case 'Headers': - return $this->tipsy()->request()->headers(); - case 'Params': - return $this->tipsy()->route()->params(); - case 'Tipsy': - return $this->tipsy(); - case 'View': - return $this->tipsy()->view(); - case 'Scope': - return $scope; - case 'RootScope': - return $this->tipsy()->rootScope(); - } + private function _getDependency(string $name, ?Scope $scope = null): mixed { + if ($name !== 'Db' && $this->tipsy()->services($name)) { + return $this->tipsy()->service($name); } - return false; + return match ($name) { + 'Db' => $this->tipsy()->db(), + 'Route' => $this->tipsy()->route(), + 'Request' => $this->tipsy()->request(), + 'Headers' => $this->tipsy()->request()->headers(), + 'Params' => $this->tipsy()->route()->params(), + 'Tipsy' => $this->tipsy(), + 'View' => $this->tipsy()->view(), + 'Scope' => $scope, + 'RootScope' => $this->tipsy()->rootScope(), + default => null, + }; } - public function inject($closure, $scope = null) { - $avail = ['Db', 'Route', 'Request', 'Headers', 'Params', 'Tipsy', 'View', 'Scope', 'RootScope']; - + public function inject(\Closure $closure, ?Scope $scope = null): mixed { if (!$this->tipsy()) { throw new Exception('Tipsy is not defined!'); } - foreach ($this->tipsy()->services() as $name => $service) { - $avail[] = $name; + // Cache reflection results — ReflectionFunction is expensive (~5μs) + $cacheKey = spl_object_id($closure); + + if (!isset(self::$_reflectionCache[$cacheKey])) { + $refFunc = new \ReflectionFunction($closure); + $paramNames = []; + foreach ($refFunc->getParameters() as $refParameter) { + $paramNames[] = $refParameter->getName(); + } + self::$_reflectionCache[$cacheKey] = $paramNames; } $args = []; - $refFunc = new \ReflectionFunction($closure); - - foreach ($refFunc->getParameters() as $refParameter) { - $name = $refParameter->getName(); - if (in_array($name, $avail)) { - $args[] = $this->_getDependency($name, $scope); - } else { - $args[] = null; - } + foreach (self::$_reflectionCache[$cacheKey] as $name) { + // _getDependency already resolves builtins, services, and unknown → null + $args[] = $this->_getDependency($name, $scope); } - return call_user_func_array($closure, $args); + return $closure(...$args); } - public function closure($closure = null) { - if ($closure) { + public function closure(?\Closure $closure = null): ?\Closure { + if ($closure !== null) { $this->_closure = $closure; } return $this->_closure; diff --git a/src/Exception.php b/src/Exception.php index ca3ec0c..cce1ab7 100644 --- a/src/Exception.php +++ b/src/Exception.php @@ -1,5 +1,7 @@ _objectMap = []; $this->_tipsy = $tipsy; } - public function objectMap($a, $b = null) { + public function count(): int { + $count = 0; + foreach ($this->_objectMap as $group) { + $count += is_array($group) ? count($group) : 0; + } + return $count; + } + + public function objectMap(mixed $a = null, mixed $b = null): mixed { // create a new object if not caching - if ($this->_tipsy->config()['tipsy']['factory'] === false) { + if (($this->_tipsy->config()['tipsy']['factory'] ?? null) === false) { $obj = new $a($b); } else { - // @todo: i dont think this is right... - if (is_string($a)) { - $t = new $a; + $t = null; + if (is_string($a) && class_exists($a)) { + $t = new $a(); } // NOCACHE: if the first param is an object, and you gave us the id, use the id you gave us @@ -28,39 +39,38 @@ public function objectMap($a, $b = null) { $obj = $this->_objectMap[get_class($a)][$b] = $a; // CACHED: if the first param is an object, the second is an id, and we have it cached - } elseif (is_object($a) && (is_string($b) || is_int($b)) && $this->_objectMap[get_class($a)][$a->{$b}]) { + } elseif (is_object($a) && (is_string($b) || is_int($b)) && isset($this->_objectMap[get_class($a)][$a->{$b}])) { $obj = $this->_objectMap[get_class($a)][$a->{$b}]; // CACHED: if the first param is an object, and we have it cached - } elseif (is_object($a) && method_exists($a, 'idVar') && $this->_objectMap[get_class($a)][$a->{$a->idVar()}]) { + } elseif (is_object($a) && method_exists($a, 'idVar') && isset($this->_objectMap[get_class($a)][$a->{$a->idVar()}])) { $obj = $this->_objectMap[get_class($a)][$a->{$a->idVar()}]; - // NOCACHE: if the first param is an object with no other info, store it. these come from Resource typicaly + // NOCACHE: if the first param is an object with no other info, store it } elseif (is_object($a) && method_exists($a, 'idVar')) { $obj = $this->_objectMap[get_class($a)][$a->{$a->idVar()}] = $a; // CACHED: if the first param is the type of object, and the second one is the id - } elseif (is_string($a) && (is_string($b) || is_int($b)) && $this->_objectMap[$a][$b]) { + } elseif (is_string($a) && (is_string($b) || is_int($b)) && isset($this->_objectMap[$a][$b])) { $obj = $this->_objectMap[$a][$b]; - // CACHED: if the first param is the type of object, and the second one is the object and we didnt know that we already had it - } elseif (is_string($a) && is_object($b) && method_exists($t, 'idVar') && $this->_objectMap[$a][$b->{$t->idVar()}]) { + // CACHED: if the first param is the type of object, and the second one is the object + } elseif (is_string($a) && is_object($b) && $t !== null && method_exists($t, 'idVar') && isset($this->_objectMap[$a][$b->{$t->idVar()}])) { $obj = $this->_objectMap[$a][$b->{$t->idVar()}]; // NOCACHE: we dont have it, so make it and store it } elseif ($a) { $obj = new $a($b); - if (!$this->_objectMap[get_class($obj)][$obj->{$obj->idVar()}]) { + if (method_exists($obj, 'idVar') && !isset($this->_objectMap[get_class($obj)][$obj->{$obj->idVar()}])) { $this->_objectMap[get_class($obj)][$obj->{$obj->idVar()}] = $obj; } // NOCACHE: you didnt give us anything to work with } else { - $obj = new Model; + $obj = new Model(); } } - // return an object of some type $t = null; return $obj; } diff --git a/src/Http.php b/src/Http.php index acb788f..261a096 100644 --- a/src/Http.php +++ b/src/Http.php @@ -1,74 +1,68 @@ $name]; } - return call_user_func_array([$this, 'request'], $args); + return $this->request(...$args); } - public function request() { - $fn = func_get_args(); + public function request(string|array $urlOrArgs = '', mixed $data = null, array $args = []): Http\Response { + $url = ''; - if (is_string($fn[0])) { - $url = $fn[0]; - } elseif (is_array($fn[0])) { - $args = $fn[0]; - } - if (count($fn) >= 2) { - $data = $fn[1]; - } - if (count($fn) == 3) { - $args = $fn[2]; + if (is_string($urlOrArgs)) { + $url = $urlOrArgs; + } elseif (is_array($urlOrArgs)) { + $args = $urlOrArgs; } - if (!$url && $args['url']) { + if (!$url && !empty($args['url'])) { $url = $args['url']; } - if (!$data && $args['data']) { + if (!$data && !empty($args['data'])) { $data = $args['data']; } - $method = strtolower($args['method'] ? $args['method'] : 'get'); - $dataType = strtolower($args['type'] == 'json' ? 'json' : 'form'); + $method = strtolower($args['method'] ?? 'get'); + $dataType = strtolower(($args['type'] ?? '') === 'json' ? 'json' : 'form'); - if ($dataType == 'json' && $method == 'post') { + if ($dataType === 'json' && $method === 'post') { $data = json_encode($data); } elseif (is_array($data)) { - if (is_array($data)) { - $data = http_build_query($data); - } + $data = http_build_query($data); } - if ($method == 'get') { - $ch = curl_init($url.'?'.$data); + if ($method === 'get' && $data) { + $ch = curl_init($url . '?' . $data); } else { $ch = curl_init($url); } curl_setopt($ch, CURLOPT_CUSTOMREQUEST, strtoupper($method)); - if ($method == 'post') { + if ($method === 'post' && $data) { curl_setopt($ch, CURLOPT_POSTFIELDS, $data); } - if ($method == 'post' && $dataType == 'form') { + if ($method === 'post' && $dataType === 'form') { curl_setopt($ch, CURLOPT_POST, true); - } elseif ($method == 'get' && $dataType == 'form') { + } elseif ($method === 'get' && $dataType === 'form') { curl_setopt($ch, CURLOPT_HTTPGET, true); } curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, !empty($args['skipSslVerify']) ? false : true); + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, !empty($args['skipSslVerify']) ? 0 : 2); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); curl_setopt($ch, CURLOPT_AUTOREFERER, true); curl_setopt($ch, CURLOPT_HEADER, true); @@ -77,9 +71,9 @@ public function request() { 'User-Agent: PHP/Tipsy/Http' ]; - if ($dataType == 'json' && $method == 'post') { + if ($dataType === 'json' && $method === 'post') { $headers[] = 'Content-Type: application/json'; - $headers[] = 'Content-Length: ' . strlen($data); + $headers[] = 'Content-Length: ' . strlen((string)$data); } curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); @@ -88,9 +82,10 @@ public function request() { $error = curl_error($ch); curl_close($ch); - while (strpos($body, 'HTTP') === 0) { - $sep = strpos($body, "\r\n\r\n") === false ? "\n\n" : "\r\n\r\n"; - list($head, $body) = explode($sep, $body, 2); + $head = ''; + while (is_string($body) && str_starts_with($body, 'HTTP')) { + $sep = str_contains($body, "\r\n\r\n") ? "\r\n\r\n" : "\n\n"; + [$head, $body] = explode($sep, $body, 2); } $heads = []; @@ -98,28 +93,13 @@ public function request() { if ($i === 0) { $heads['http_code'] = $line; } else { - list ($key, $value) = explode(': ', $line); - } - if ($key) { - $heads[$key] = $value; - } - } - - return new Http\Response($error, $body, $heads); - } - - /** dont this this is needed anymore - private function _parse($headers) { - $ret = []; - foreach (explode("\n",$headers) as $header) { - if (preg_match('/HTTP\//i',$header)) { - $header = explode(' ',$header); - $this->headers[$header[0]] = $header[1]; - } else { - $header = explode(':',$header, 2); - $this->headers[$header[0]] = $header[1]; + [$key, $value] = array_pad(explode(': ', $line, 2), 2, ''); + if ($key) { + $heads[$key] = $value; + } } } + + return new Http\Response($error ?: '', $body ?: '', $heads); } - **/ } diff --git a/src/Http/Response.php b/src/Http/Response.php index 3b3e12f..a72fb76 100644 --- a/src/Http/Response.php +++ b/src/Http/Response.php @@ -1,50 +1,53 @@ _body = $body; - $this->_headers = $headers; + private readonly bool $_status; + private readonly string $_httpStatus; + private readonly string $_errors; + private string|object|null $_body; + private readonly array $_headers; + + public function __construct(string $errors, string $body, array $headers) { $this->_errors = $errors; - $this->_httpStatus = explode(' ', $headers['http_code'])[1]; + $this->_headers = $headers; + $this->_httpStatus = explode(' ', $headers['http_code'] ?? '')[1] ?? ''; - if ($this->_errors || $this->_httpStatus{0} == '4' || $this->_httpStatus{0} == '5') { - $this->_status = false; - } else { - $this->_status = true; - } + $this->_status = !($this->_errors || (isset($this->_httpStatus[0]) && ($this->_httpStatus[0] === '4' || $this->_httpStatus[0] === '5'))); - $type = explode(';',$headers['Content-Type'])[0]; + $type = explode(';', $headers['Content-Type'] ?? '')[0]; - if ($type == 'application/json') { - $this->_body = json_decode($this->_body); + if ($type === 'application/json') { + $this->_body = json_decode($body); + } else { + $this->_body = $body; } } - public function headers() { + public function headers(): array { return $this->_headers; } - public function body() { + + public function body(): string|object|null { return $this->_body; } - public function complete($fn) { + + public function complete(callable $fn): static { $fn($this->body(), $this->headers()); return $this; } - public function error($fn) { + + public function error(callable $fn): static { if ($this->_status === false) { $this->complete($fn); } return $this; } - public function success($fn) { + + public function success(callable $fn): static { if ($this->_status !== false) { $this->complete($fn); } diff --git a/src/Looper.php b/src/Looper.php index 5ba0374..b9c0595 100644 --- a/src/Looper.php +++ b/src/Looper.php @@ -1,14 +1,18 @@ _items as $key => $item) { if (is_object($item) && method_exists($item, 'exports')) { $items[$key] = $item->exports(); @@ -19,13 +23,12 @@ public function jsonSerialize() { return $items; } - public function __construct() { + public function __construct(mixed ...$args) { $items = []; - $args = func_get_args(); $args = array_reverse($args); foreach ($args as $arg) { - if (is_object($arg) && (get_class($arg) == 'Tipsy\Looper' || is_subclass_of($arg, 'Tipsy\Looper'))) { + if ($arg instanceof self) { $arg = $arg->items(); } elseif (is_object($arg)) { $arg = [$arg]; @@ -37,116 +40,116 @@ public function __construct() { $this->_position = 0; } - // if anyone knows any way to pass func_get_args by reference i would love you. i want string manipulation - public static function o() { - $iterator = new \ReflectionClass(get_called_class()); - return $iterator->newInstanceArgs(func_get_args()); + public static function o(mixed ...$args): static { + return new static(...$args); } - public function items() { + public function items(): array { return $this->_items; } - public function get($index) { + public function get(int $index): mixed { return $this->eq($index); } - public function set($var, $val) { + public function set(string $var, mixed $val): static { if ($var) { foreach ($this->_items as $item) { $item->{$var} = $val; - }; + } } return $this; } - public function eq($pos) { + public function eq(int $pos): mixed { $pos = $pos < 0 ? count($this->_items) - abs($pos) : $pos; - return $this->_items[$pos]; + return $this->_items[$pos] ?? null; } - public function remove($start) { + public function remove(int $start): static { unset($this->_items[$start]); return $this; } - public function slice($start, $end = null) { - $items = $this->_items; - $items = array_slice($items, $start, $end); - + public function slice(int $start, ?int $end = null): static { + $items = array_slice($this->_items, $start, $end); return $this->_returnItems($items); } - public function not() { - $items = call_user_func_array([$this, '_filter'], func_get_args()); - return $this->_returnItems($items['no']); + public function not(mixed ...$args): static { + $items = $this->_filter(...$args); + return $this->_returnItems($items['no'] ?? []); } - public function filter() { - $items = call_user_func_array([$this, '_filter'], func_get_args()); - return $this->_returnItems($items['yes']); + public function filter(mixed ...$args): static { + $items = $this->_filter(...$args); + return $this->_returnItems($items['yes'] ?? []); } - public function each($func, $params = []) { + public function each(callable $func, array $params = []): void { foreach ($this->_items as $key => $item) { - $func = $func->bindTo(!is_object($item) ? (object)$item : $item); + if ($func instanceof \Closure) { + $func = $func->bindTo(!is_object($item) ? (object)$item : $item); + } $res = $func($key, $item); $this->_items[$key] = $item; - if ($res == self::DONE) { + if ($res === self::DONE) { break; } } } - public function json($args = []) { - return json_encode($this->jsonSerialize()); + public function json(array $args = []): string { + return json_encode($this->jsonSerialize()) ?: '[]'; } - public function e($f) { - self::each($f); + public function e(callable $f): void { + $this->each($f); } - public function rewind() { + public function rewind(): void { $this->_position = 0; } - public function current() { + public function current(): mixed { return $this->_items[$this->_position]; } - public function key() { + public function key(): int { return $this->_position; } - public function next() { + public function next(): void { ++$this->_position; } - public function valid() { + public function valid(): bool { return isset($this->_items[$this->_position]); } - public function count() { + public function count(): int { return count($this->_items); } - public function parent() { + public function parent(): ?self { return $this->_parent; } - private function _filter() { + private function _filter(mixed ...$filterArgs): array { $items = $this->_items; $mismatch = []; $strict = false; + $func = null; + $filters = []; - if (func_num_args() == 1 && is_callable(func_get_arg(0))) { - $func = func_get_arg(0); + if (count($filterArgs) === 1 && is_callable($filterArgs[0])) { + $func = $filterArgs[0]; - } elseif (func_num_args() == 2 && !is_array(func_get_arg(0)) && !is_array(func_get_arg(1))) { - $filters[][func_get_arg(0)] = func_get_arg(1); + } elseif (count($filterArgs) === 2 && !is_array($filterArgs[0]) && !is_array($filterArgs[1])) { + $filters[][$filterArgs[0]] = $filterArgs[1]; } else { - foreach (func_get_args() as $arg) { + foreach ($filterArgs as $arg) { if (is_array($arg)) { $filters[] = $arg; } @@ -154,7 +157,7 @@ private function _filter() { } if ($filters) { - foreach ($filters as $key => $set) { + foreach ($filters as $set) { foreach ($items as $key => $item) { $mis = 0; foreach ($set as $k => $v) { @@ -162,8 +165,8 @@ private function _filter() { $mis++; } } - if (($strict && count($set) == $mis) || $mis) { - $mismatch[$key]++; + if (($strict && count($set) === $mis) || $mis) { + $mismatch[$key] = ($mismatch[$key] ?? 0) + 1; } } } @@ -171,27 +174,30 @@ private function _filter() { if ($func) { foreach ($items as $key => $item) { - if (!$func($item,$key)) { + if (!$func($item, $key)) { $mismatch[$key] = $key; break; } } } + $newitems = []; + $trash = []; + foreach ($items as $key => $value) { - if (array_key_exists($key, $mismatch) && ($func || $mismatch[$key] == count($filters))) { + if (array_key_exists($key, $mismatch) && ($func || ($mismatch[$key] ?? 0) === count($filters))) { $trash[] = $items[$key]; } else { $newitems[] = $items[$key]; } } - return ['yes' => $newitems,'no' => $trash]; + return ['yes' => $newitems, 'no' => $trash]; } - private function _returnItems($items) { - if (count($items) != count($this->_items)) { - $return = new self($items); + private function _returnItems(array $items): static { + if (count($items) !== count($this->_items)) { + $return = new static($items); $return->_parent = $this; } else { $return = $this; @@ -199,82 +205,40 @@ private function _returnItems($items) { return $return; } - public function __toString() { + public function __toString(): string { $print = ''; - foreach ($this->_items as $key => $item) { - if (is_object($item) && method_exists($item,'__toString')) { + foreach ($this->_items as $item) { + if (is_object($item) && method_exists($item, '__toString')) { $print .= $item->__toString(); } elseif (is_string($item) || is_int($item)) { - $print .= $item; + $print .= (string)$item; } } return $print; } - public function __call($name, $arguments) { - foreach ($this->_items as $key => $item) { - if (is_callable($item, $name) || method_exists($item, $name)) { - $items[] = (new \ReflectionMethod($item, $name))->invokeArgs($item, $arguments); - } else { - // not callable + public function __call(string $name, array $arguments): static { + $items = []; + foreach ($this->_items as $item) { + if (is_callable([$item, $name]) || method_exists($item, $name)) { + $items[] = $item->$name(...$arguments); } } - return self::o($items); + return static::o($items); } - public function &__get($name) { - /** looper should never need this, but this might break stuff - if (property_exists($this,$name)) { - return $this->{$name}; - } else { - if (isset($name{0}) && $name{0} == '_') { - return $this->_items[0]->{$name}; - } else { - return $this->_items[0]->_properties[$name]; - } - } - */ - if (isset($name{0}) && $name{0} == '_') { + public function &__get(string $name): mixed { + if (isset($name[0]) && $name[0] === '_') { return $this->_items[0]->{$name}; } else { return $this->_items[0]->_properties[$name]; } } - public function __set($name, $value) { - /** looper should never need this, but this might break stuff - if (property_exists($this,$name)) { - $this->{$name} = $value; - } else { - foreach ($this->_items as $key => $item) { - $this->_items[$key]->{$name} = $value; - } - } - */ + public function __set(string $name, mixed $value): void { foreach ($this->_items as $key => $item) { $this->_items[$key]->{$name} = $value; } - return $value; - } - - /** these appear to never have been implimented correctly - - public function __isset($property) { - if (isset($property{0}) && $property{0} == '_') { - return $this->_items[0]->{$property} ? true : false; - } else { - return $this->_items[0]->_properties[$property] ? true : false; - } - } - - public function __unset($property) { - if (isset($property{0}) && $property{0} == '_') { - unset($this->_items[0]->{$property}); - } else { - unset($this->_items[0]->_properties[$property]); - } - return $this; } - **/ } diff --git a/src/Middleware.php b/src/Middleware.php index 8d0822c..935d4a8 100644 --- a/src/Middleware.php +++ b/src/Middleware.php @@ -1,24 +1,29 @@ closure()) { - return $this->inject($this->closure(), $this->_scope); + return $this->inject($this->closure(), $this->_scope ?? null); } + return null; } - public function run($args = null) { + + public function run(mixed $args = null): mixed { // dont need to do anything for now + return null; } - public static function _start($middleware, $tipsy) { + public static function _start(array $middleware, App $tipsy): void { $m = $tipsy->service($middleware['service']); if ($m->hasMethod('run') || method_exists($m, 'run')) { $status = $m->run($middleware['args']); if ($status === false) { - throw new Exception('Middleware "'.$middleware['service'].'" failed to start'); + throw new Exception('Middleware "' . $middleware['service'] . '" failed to start'); } } } diff --git a/src/Model.php b/src/Model.php index 489118d..7bf7ca3 100644 --- a/src/Model.php +++ b/src/Model.php @@ -1,79 +1,88 @@ exports()); } - public function jsonSerialize() { + public function jsonSerialize(): mixed { return $this->exports(); } - public function addMethod($method, $closure) { + public function addMethod(string $method, callable $closure): void { $this->_methods[$method] = $closure; } - public function hasMethod($method) { - return $this->_methods[$method] ? true : false; + public function hasMethod(string $method): bool { + return isset($this->_methods[$method]) && is_callable($this->_methods[$method]); } - public static function __callStatic($method, $args = []) { - $name = '__'.$method.'_static'; + public static function __callStatic(string $method, array $args = []): mixed { + $name = '__' . $method . '_static'; - if (method_exists(get_called_class(),$name)) { - return (new \ReflectionMethod(get_called_class(), $name))->invokeArgs(null, $args); + if (method_exists(static::class, $name)) { + return (new \ReflectionMethod(static::class, $name))->invokeArgs(null, $args); } else { - throw new Exception('Could not call static ' . $method. ' on '.get_called_class()); + throw new Exception('Could not call static ' . $method . ' on ' . static::class); } } - public function __call($method, $args = []) { - if (is_callable($this->_methods[$method])) { + public function __call(string $method, array $args = []): mixed { + if (isset($this->_methods[$method]) && is_callable($this->_methods[$method])) { $this->_methods[$method] = $this->_methods[$method]->bindTo($this); - return call_user_func_array($this->_methods[$method], $args); - } elseif (method_exists($this,'__'.$method)) { - // @todo: internets say call_user_func_array is faster but who knows - //return (new \ReflectionMethod($this, '__'.$method))->invokeArgs($this, $args); - return call_user_func_array([$this, '__'.$method], $args); + return ($this->_methods[$method])(...$args); + } elseif (method_exists($this, '__' . $method)) { + return $this->{'__' . $method}(...$args); } else { - throw new Exception('Could not call ' . $method. ' on '.get_class()); + throw new Exception('Could not call ' . $method . ' on ' . static::class); } } - public function &__properties() { - return $this->_properties ? $this->_properties : get_object_vars($this); + public function &__properties(): array { + if (!$this->_properties) { + // Copy dynamic public props into the bag so we can return by reference safely + foreach (get_object_vars($this) as $key => $value) { + if ($key !== '_properties' && $key !== '_methods' && !(isset($key[0]) && $key[0] === '_')) { + $this->_properties[$key] = $value; + } + } + } + return $this->_properties; } - public function &__property($name) { - return isset($this->_properties[$name]) ? $this->_properties[$name] : null; + public function &__property(string $name): mixed { + return $this->_properties[$name]; } - public function &__get($name) { - if (isset($name{0}) && $name{0} == '_') { + public function &__get(string $name): mixed { + if (isset($name[0]) && $name[0] === '_') { return $this->{$name}; } else { return $this->_properties[$name]; } } - public function __set($name, $value) { - if ($name{0} == '_') { - return $this->{$name} = $value; + public function __set(string $name, mixed $value): void { + if ($name[0] === '_') { + $this->{$name} = $value; } else { - return $this->_properties[$name] = $value; + $this->_properties[$name] = $value; } } - public function __isset($name) { - return $name{0} == '_' ? isset($this->{$name}) : isset($this->_properties[$name]); + public function __isset(string $name): bool { + return $name[0] === '_' ? isset($this->{$name}) : isset($this->_properties[$name]); } - public function __exports() { + public function __exports(): array { $out = $this->__properties(); foreach ($out as $k => $v) { if (is_callable($v)) { @@ -83,10 +92,10 @@ public function __exports() { return $out; } - public function tipsy($tipsy = null) { - if (!is_null($tipsy)) { + public function tipsy(?App $tipsy = null): ?App { + if ($tipsy !== null) { $this->_tipsy = $tipsy; } - return $this->_tipsy; + return $this->_tipsy ?? null; } } diff --git a/src/Request.php b/src/Request.php index bf485da..6b09b1f 100644 --- a/src/Request.php +++ b/src/Request.php @@ -1,121 +1,116 @@ _properties = []; - - /** dont think this is needed, but leaving here just in case - if ($args['tipsy']) { - $this->_tipsy = $args['tipsy']; + private array $_properties = []; + private array|false|null $_rawRequest = null; + private string|false|null $_content = null; + private ?array $_headers = null; + private ?string $_path = null; + private ?string $_base = null; + private ?string $_contentType = null; + private ?string $_method = null; + + public function __construct(array $args = []) { + $method = $this->method(); + if ($method) { + $contentType = $this->_contentType(); + $this->_properties = match ($method) { + 'GET' => $contentType === 'application/json' ? ($this->raw() ?: []) : ($_GET ?? []), + 'POST' => match ($contentType) { + 'application/json' => json_decode($this->content() ?: '', true) ?: [], + 'multipart/form-data' => $_REQUEST ?? [], + default => $_POST ?? [], + }, + default => $this->_parseBodyContent(), + }; + + if (!is_array($this->_properties)) { + $this->_properties = []; + } + } + } + + private function _parseBodyContent(): array { + if ($this->_contentType() === 'application/x-www-form-urlencoded') { + $result = []; + parse_str($this->content() ?: '', $result); + return $result; } - **/ - - if ($this->method()) { - switch ($this->method()) { - case 'GET': - if ($this->_contentType() === 'application/x-www-form-urlencoded' || !$this->_contentType()) { - $this->_properties = $_GET; - } elseif ($this->_contentType() === 'application/json') { - $this->_properties = $this->raw(); - } - break; - - case 'POST': - if ($this->_contentType() === 'application/json') { - $this->_properties = json_decode($this->content(), 'array'); - } elseif ($this->_contentType() === 'multipart/form-data') { - $this->_properties = $_REQUEST; - } else { - $this->_properties = $_POST; - } - break; - - case 'PUT': - case 'DELETE': - default: - if ($this->_contentType() === 'application/x-www-form-urlencoded') { - parse_str($this->content(), $this->_properties); - - } elseif ($this->_contentType() === 'application/json') { - $content = $this->content(); - $request = json_decode($content,'array'); - if (!$request) { - $this->_properties = false; - } else { - $this->_properties = $request; - } - } - break; + if ($this->_contentType() === 'application/json') { + $content = $this->content(); + if ($content) { + $request = json_decode($content, true); + return is_array($request) ? $request : []; } } + return []; } - private function _contentType() { - if (!isset($this->_contentType)) { - $this->_contentType = explode(';',$_SERVER['CONTENT_TYPE'])[0]; + private function _contentType(): ?string { + if ($this->_contentType === null) { + $this->_contentType = isset($_SERVER['CONTENT_TYPE']) + ? explode(';', $_SERVER['CONTENT_TYPE'])[0] + : ''; } - return $this->_contentType; + return $this->_contentType ?: null; } - public function base() { + public function base(): ?string { return $this->_base; } - public function loc($piece = 0) { + public function loc(int $piece = 0): string { $paths = explode('/', $this->path()); - return $paths[$piece]; + return $paths[$piece] ?? ''; } - public function host() { - return 'http://'.$_SERVER['HTTP_HOST']; + public function host(): string { + $scheme = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; + return $scheme . '://' . ($_SERVER['HTTP_HOST'] ?? 'localhost'); } - public function url() { - return $this->host().'/'.$this->path(); + public function url(): string { + return $this->host() . '/' . $this->path(); } - public function path($url = null) { + public function path(?string $url = null): string { - if (!isset($this->_path)) { + if ($this->_path === null) { if (!$url) { - if ($_REQUEST['__url']) { + if (!empty($_REQUEST['__url'])) { $url = $_REQUEST['__url']; } else { + $request = explode('?', $_SERVER['REQUEST_URI'] ?? '', 2)[0]; + + $script = $_SERVER['SCRIPT_NAME'] ?? ''; + $dir = dirname($script); + + // Strip script file then script directory prefixes without preg + if ($script !== '' && str_starts_with($request, $script)) { + $url = substr($request, strlen($script)); + } elseif ($dir !== '' && $dir !== '/' && $dir !== '\\' && str_starts_with($request, $dir)) { + $url = substr($request, strlen($dir)); + } else { + $url = $request; + } - $request = explode('?', $_SERVER['REQUEST_URI'], 2)[0]; - - $dir = $_SERVER['SCRIPT_NAME']; - $url = preg_replace('/^'.str_replace('/','\\/',''.$dir).'/','',$request); - - $dir = dirname($_SERVER['SCRIPT_NAME']); - $url = preg_replace('/^'.str_replace('/','\\/',''.$dir).'/','',$url); - - $url = substr($url, 0, 1) == '/' ? $url : '/'.$url; - $this->_base = substr($dir, -1) == '/' ? $dir : $dir.'/'; + // dirname('file.php') => '.' — preserve historical "./" base + $this->_base = str_ends_with($dir, '/') ? $dir : $dir . '/'; } } - while (strpos($url, '//') !== false) { - $url = str_replace('//', '/', $url); - } - - if ($url{0} == '/') { - $url = substr($url, 1); + $url = trim(str_replace('//', '/', $url), " \t\n\r\0\x0B/"); + // Second pass covers residual triples like /// → / + if (str_contains($url, '//')) { + $url = preg_replace('#/+#', '/', $url) ?? $url; + $url = trim($url, '/'); } - $url = trim($url); - $url = ltrim($url, '/'); - $url = rtrim($url, '/'); - $url = trim($url); $this->_path = $url; } @@ -123,50 +118,49 @@ public function path($url = null) { return $this->_path; } - public function content() { - if (!isset($this->_content)) { - if (strlen(trim($this->_content = file_get_contents(!is_null($_ENV['TESTS_PHP_INPUT']) ? $_ENV['TESTS_PHP_INPUT'] : 'php://input'))) === 0) { - $this->_content = false; - } + public function content(): string|false { + if ($this->_content === null) { + $input = $_ENV['TESTS_PHP_INPUT'] ?? 'php://input'; + $raw = file_get_contents($input); + $this->_content = ($raw !== false && strlen(trim($raw)) > 0) ? $raw : false; } return $this->_content; } - public function raw() { - if (!isset($this->_rawRequest)) { - $request = trim($_SERVER['REQUEST_URI']); - $request = substr($request,strpos($request,'?')+1); + public function raw(): array|false { + if ($this->_rawRequest === null) { + $request = trim($_SERVER['REQUEST_URI'] ?? ''); + $request = substr($request, strpos($request, '?') + 1); $request = urldecode($request); - $request = json_decode($request,'array'); + $decoded = json_decode($request, true); - if (!$request) { - $this->_rawRequest = false; - } else { - $this->_rawRequest = $request; - } + $this->_rawRequest = is_array($decoded) ? $decoded : false; } - return $this->_rawRequest; + return $this->_rawRequest ?: false; } - public function method() { - return strtoupper($_SERVER['REQUEST_METHOD']); + public function method(): string { + if ($this->_method === null) { + $this->_method = strtoupper($_SERVER['REQUEST_METHOD'] ?? 'GET'); + } + return $this->_method; } - public function &__get($name) { + public function &__get(string $name): mixed { return $this->_properties[$name]; } - public function __set($name, $value) { - return $this->_properties[$name] = $value; + public function __set(string $name, mixed $value): void { + $this->_properties[$name] = $value; } - public function &request() { + public function &request(): array { return $this->_properties; } - public function headers() { - if (!isset($this->_headers)) { - $this->_headers = getallheaders(); + public function headers(): array { + if ($this->_headers === null) { + $this->_headers = getallheaders() ?: []; } return $this->_headers; } diff --git a/src/Resource.php b/src/Resource.php index e3a4c49..91ca47f 100644 --- a/src/Resource.php +++ b/src/Resource.php @@ -1,53 +1,39 @@ load($args); + } + return; + } $this->_baseConfig = $args; - if ($args['_tipsy']) { + if (isset($args['_tipsy'])) { $this->_tipsy = $args['_tipsy']; unset($args['_tipsy']); } - if ($args['_service']) { + if (isset($args['_service'])) { $this->_service = $args['_service']; unset($args['_service']); } - /* - foreach ($args as $key=>$arg) { - echo $key."\n"; - } - echo "\n\n"; - if (!$args) { - - // auto table name and id - $args = [ - 'id' => '', - 'table' => '' - ]; - } - */ - - if ($args['_id']) { + if (isset($args['_id'])) { $this->idVar($args['_id']); unset($args['_id']); } - if ($args['_table']) { + if (isset($args['_table'])) { $this->table($args['_table']); unset($args['_table']); } - if ($args['_fields']) { + if (isset($args['_fields'])) { $this->__fields = $args['_fields']; unset($args['_fields']); } @@ -61,88 +47,46 @@ public function __construct($args = []) { /** * Retrieve a field list from the db * - * Will populate $this->fields based on he columns in the db for the + * Will populate $this->fields based on the columns in the db for the * current objects table. * * @return array */ - public function fields() { + public function fields(): array { if ($fields = $this->db()->fields($this->table())) { $this->_fields = $fields; } else { $fields = []; - switch ($this->db()->driver()) { - case 'mysql': - $q = 'SHOW COLUMNS FROM `'.$this->table().'`'; - break; - - case 'sqlite': - $q = 'PRAGMA table_info("'.$this->table().'")'; - break; - - case 'pgsql': - $q = 'SELECT column_name as Field, data_type as Type, is_nullable as Null, column_default as Default FROM information_schema.columns WHERE table_name = \''.$this->table().'\''; - break; - } + $table = $this->db()->quoteIdent($this->table()); + $q = match ($this->db()->driver()) { + 'mysql' => 'SHOW COLUMNS FROM ' . $table, + 'sqlite' => 'PRAGMA table_info(' . $table . ')', + 'pgsql' => 'SELECT column_name AS field, data_type AS type, is_nullable AS nullable, column_default AS col_default' + . ' FROM information_schema.columns' + . ' WHERE table_schema = current_schema() AND table_name = ' . $this->db()->db()->quote($this->table()), + default => throw new Exception('Unsupported database driver: ' . ($this->db()->driver() ?? 'unknown')), + }; try { - $rows = $this->db()->get($q); - if (!count($rows)) { - $this->createTable(); - } else { - - foreach ($rows as $row) { - - switch ($this->db()->driver()) { - case 'sqlite': - $fields[$row->name] = (object)[ - 'field' => $row->name, - 'type' => $row->type, - 'null' => $row->notnull ? false : true - ]; - break; - - case 'mysql': - $fields[$row->Field] = (object)[ - 'field' => $row->Field, - 'type' => $row->Type, - 'null' => $row->Null == 'YES' ? true : false, - 'auto' => $row->Extra == 'auto_increment' ? true : false - ]; - - if ($fields[$row->Field]->type == 'tinyint(1)' || $fields[$row->Field]->type == 'tinyint(1) unsigned') { - $fields[$row->Field]->type = 'boolean'; - } elseif (strpos($fields[$row->Field]->type, 'int') !== false) { - $fields[$row->Field]->type = 'int'; - } - - break; - - case 'pgsql': - $fields[$row->field] = (object)[ - 'field' => $row->field, - 'type' => $row->type, - 'null' => $row->null == 'YES' ? true : false, - 'auto' => $row->default && preg_match('/^nextval\(/',$row->default) ? true : false - ]; - - if ($fields[$row->field]->type == 'integer') { - $fields[$row->field]->type = 'int'; - } - - if ($fields[$row->field]->auto && $fields[$row->field]->field == $this->idVar()) { - $fields[$row->field]->sequence = preg_replace('/^nextval\(\'(.*)\'.*\)$/i','\\1', $row->default); - } - break; - } - } - } - } catch (\Exception $e) { - // table doesnt exist. create it if we can + $rows = []; + } + + if (!count($rows)) { + // Create then re-read metadata — never cache an empty field list $this->createTable(); + $rows = $this->db()->get($q); + } + + foreach ($rows as $row) { + $fields = match ($this->db()->driver()) { + 'sqlite' => $this->_parseSqliteField($row, $fields), + 'mysql' => $this->_parseMysqlField($row, $fields), + 'pgsql' => $this->_parsePgsqlField($row, $fields), + default => $fields, + }; } $this->_fields = $fields; @@ -151,83 +95,118 @@ public function fields() { return $this->_fields; } - public function get($id = null) { + private function _parseSqliteField(object $row, array $fields): array { + $fields[$row->name] = (object)[ + 'field' => $row->name, + 'type' => $row->type, + 'null' => $row->notnull ? false : true + ]; + return $fields; + } + + private function _parseMysqlField(object $row, array $fields): array { + $fields[$row->Field] = (object)[ + 'field' => $row->Field, + 'type' => $row->Type, + 'null' => $row->Null === 'YES', + 'auto' => $row->Extra === 'auto_increment' + ]; + + if ($fields[$row->Field]->type === 'tinyint(1)' || $fields[$row->Field]->type === 'tinyint(1) unsigned') { + $fields[$row->Field]->type = 'boolean'; + } elseif (str_contains($fields[$row->Field]->type, 'int')) { + $fields[$row->Field]->type = 'int'; + } + + return $fields; + } + + private function _parsePgsqlField(object $row, array $fields): array { + $name = $row->field; + $default = $row->col_default ?? null; + $fields[$name] = (object)[ + 'field' => $name, + 'type' => $row->type, + 'null' => ($row->nullable ?? '') === 'YES', + 'auto' => !empty($default) && preg_match('/^nextval\(/', (string)$default) === 1 + ]; + + if (in_array($fields[$name]->type, ['integer', 'bigint', 'smallint'], true)) { + $fields[$name]->type = 'int'; + } elseif (in_array($fields[$name]->type, ['boolean', 'bool'], true)) { + $fields[$name]->type = 'boolean'; + } + + if ($fields[$name]->auto && $fields[$name]->field === $this->idVar()) { + $fields[$name]->sequence = preg_replace('/^nextval\(\'(.*?)\'.*\)$/i', '\\1', (string)$default); + } + return $fields; + } + + public function get(int|string|null $id = null): static { return $this; } - public function createTable() { + public function createTable(): void { if (!$this->__fields) { - throw new Exception('Could not create table "'.$this->table().'"'); + throw new Exception('Could not create table "' . $this->table() . '"'); } - $q = 'create table `'.$this->table().'` ('; + $q = 'CREATE TABLE ' . $this->db()->quoteIdent($this->table()) . ' ('; foreach ($this->__fields as $k => $field) { - $q .= ' `'.$k.'` '.$field->name.' '; - - if ($field->default === null) { - $default = 'NULL'; - } elseif ($field->default === true) { - $default = 'true'; - } elseif ($field->default === false) { - $default = 'false'; - } elseif (is_int($field->default)) { - $default = $field->default; - } else { - $default = "'".$field->default."'"; - } - - switch ($field->type) { - case 'int': - if ($this->db()->driver() == 'pgsql') { - $int = $field->auto ? 'serial' : 'integer' - .($field->null ? '' : ' NOT NULL '); - } else { - $int = 'int('.($field->length ? $field->length : 11).')' - .($field->unsigned ? 'unsigned' : '') - .($field->null ? '' : ' NOT NULL ') - .($field->auto ? ' AUTO_INCREMENT ' : '') - .($field->default ? ' DEFAULT '.$default : ''); - } - $q .= $int.' '; - break; - - case 'char': - $q .= 'varchar('.($field->length ? $field->length : 255).') ' - .($field->null ? '' : ' NOT NULL ') - .($field->default ? ' DEFAULT '.$default : ''); - break; - - case 'bool': - if ($this->db()->driver() == 'pgsql') { - $bool = 'bool NOT NULL '; - } else { - $bool = 'tinyint(1) NOT NULL '; - } - $q .= $bool.' ' - .($field->default ? ' DEFAULT '.$default : ''); - break; - } + $q .= ' ' . $this->db()->quoteIdent($k) . ' '; + + $fieldDefault = $field->default ?? null; + $default = match (true) { + $fieldDefault === null => 'NULL', + $fieldDefault === true => 'true', + $fieldDefault === false => 'false', + is_int($fieldDefault) => (string)$fieldDefault, + default => "'" . $fieldDefault . "'", + }; + + $q .= match ($field->type) { + 'int' => $this->_createIntColumn($field, $default), + 'char' => 'varchar(' . ($field->length ?? 255) . ') ' + . (!empty($field->null) ? '' : ' NOT NULL ') + . ($fieldDefault !== null ? ' DEFAULT ' . $default : ''), + 'bool' => ($this->db()->driver() === 'pgsql' ? 'bool NOT NULL ' : 'tinyint(1) NOT NULL ') + . ($fieldDefault !== null ? ' DEFAULT ' . $default : ''), + default => '', + }; $q .= ','; } - $q .= 'PRIMARY KEY (`'.$this->idVar().'`))'; + $q .= 'PRIMARY KEY (' . $this->db()->quoteIdent($this->idVar()) . '))'; $this->db()->query($q); } - public function dropTable() { - $this->db()->query('DROP TABLE IF EXISTS `'.$this->table().'`'); + private function _createIntColumn(object $field, string $default): string { + if ($this->db()->driver() === 'pgsql') { + return ($field->auto ? 'serial' : 'integer') + . ($field->null ? '' : ' NOT NULL '); + } + return 'int(' . ($field->length ?: 11) . ')' + . ($field->unsigned ? 'unsigned' : '') + . ($field->null ? '' : ' NOT NULL ') + . ($field->auto ? ' AUTO_INCREMENT ' : '') + . ($field->default ? ' DEFAULT ' . $default : ''); + } + + public function dropTable(): void { + $this->db()->query('DROP TABLE IF EXISTS ' . $this->db()->quoteIdent($this->table())); } - public static function __create_static($args = []) { - $name = get_called_class(); + public static function __create_static(array $args = []): static { + $name = static::class; $args['_tipsy'] = Tipsy::app(); $obj = new $name($args); $obj->save(); return $obj; } - public function __create($args = []) { + public function __create(array $args = []): static { $object = clone $this; $object->tipsy($this->tipsy()); $object->load($args); @@ -235,7 +214,7 @@ public function __create($args = []) { return $object; } - public function dbId() { + public function dbId(): mixed { return $this->{$this->idVar()}; } @@ -246,19 +225,24 @@ public function dbId() { * as public properties. Passing in an int id will load the object with the * table and key associated with the object. * - * @param $id object|int + * @param $id object|array|int|string|null */ - public function load($id = null) { + public function load(object|array|int|string|null $id = null): static { // fill the object with blank properties based on the fields of that table $fields = $this->fields(); foreach ($fields as $key => $field) { - $this->{$key} = $this->{$key} ? $this->{$key} : ''; + // Use isset — `?:` would coerce false/0 into '' and break PG booleans/ints + if (!isset($this->{$key})) { + $this->{$key} = ''; + } } if (!$id && $this->dbId()) { $id = $this->dbId(); } + $node = null; + if (is_object($id)) { $node = $id; @@ -266,33 +250,31 @@ public function load($id = null) { $node = (object)$id; } elseif ($id) { - if (!$node) { - $node = (object)$this->db()->get('select * from `' . $this->table() . '` where `'.$this->idVar().'` = ? limit 1', [$id])[0]; - } + $result = $this->db()->get( + 'SELECT * FROM ' . $this->db()->quoteIdent($this->table()) + . ' WHERE ' . $this->db()->quoteIdent($this->idVar()) . ' = ? LIMIT 1', + [$id] + ); + $node = !empty($result[0]) ? (object)$result[0] : null; } if (!$node) { - $node = new Model; + $node = new Model(); } - if (isset($node)) { - foreach(get_object_vars($node) as $var => $value) { - $this->$var = $value; - } + foreach (get_object_vars($node) as $var => $value) { + $this->$var = $value; } foreach ($this->fields() as $field) { - switch ($field->type) { - case 'int': - $this->{$field->field} = (int)$this->{$field->field}; - break; - case 'boolean': - $this->{$field->field} = $this->{$field->field} ? true : false; - break; - } + match ($field->type) { + 'int' => $this->{$field->field} = (int)$this->{$field->field}, + 'boolean' => $this->{$field->field} = (bool)$this->{$field->field}, + default => null, + }; } - if ($this->tipsy() && $this->tipsy()->config()['tipsy']['factory'] !== false) { + if ($this->tipsy() && ($this->tipsy()->config()['tipsy']['factory'] ?? null) !== false) { $this->tipsy()->factory($this); } @@ -301,75 +283,64 @@ public function load($id = null) { /** - * Saves an entry in the db. if there is no curerent id it will add one + * Saves an entry in the db. if there is no current id it will add one */ - public function save($insert = null) { - if (is_null($insert)) { + public function save(?bool $insert = null): static { + if ($insert === null) { $insert = $this->dbId() ? false : true; } - if ($insert) { - $query = 'INSERT INTO `'.$this->table().'`'; - } else { - $query = 'UPDATE `'.$this->table().'`'; - } + $table = $this->db()->quoteIdent($this->table()); + $query = $insert + ? 'INSERT INTO ' . $table + : 'UPDATE ' . $table; $fields = $this->fields(); - $numset = 0; + $fs = []; foreach ($fields as $field) { - if ($field->auto === true && $insert && $field->field == $this->idVar()) { + if ($field->auto === true && $insert && $field->field === $this->idVar()) { continue; } - if ($this->{$field->field} == '' && $field->null) { + if ($this->{$field->field} === '' && $field->null) { $this->{$field->field} = null; - } elseif ($this->{$field->field} == null && !$field->null) { - $this->{$field->field} = ''; + } elseif ($this->{$field->field} === null && !$field->null) { + $this->{$field->field} = match ($field->type) { + 'boolean' => false, + 'int' => 0, + default => '', + }; } - switch ($field->type) { - case 'boolean': - $this->{$field->field} = $this->{$field->field} ? true : false; - if ($this->db()->driver() == 'mysql') { - $this->{$field->field} = $this->{$field->field} ? 1 : 0; - } - break; - - case 'int': - $this->{$field->field} = intval($this->{$field->field}); - break; - - case 'datetime': - if ($this->{$field->field} == '0000-00-00 00:00:00' && $field->null) { - $this->{$field->field} = null; - } - break; - - case 'date': - if ($this->{$field->field} == '0000-00-00' && $field->null) { - $this->{$field->field} = null; - } - break; - } + match ($field->type) { + 'boolean' => $this->_prepareBoolField($field), + 'int' => $this->{$field->field} = intval($this->{$field->field}), + 'datetime' => $this->_prepareDatetimeField($field), + 'date' => $this->_prepareDateField($field), + default => null, + }; $this->{$field->field} = (!$this->{$field->field} && $field->null) ? null : $this->{$field->field}; + $ident = $this->db()->quoteIdent($field->field); $query .= !$numset ? ($insert ? '(' : ' SET ') : ','; if ($insert) { - $query .= ' `'.$field->field.'` '; + $query .= ' ' . $ident . ' '; } else { - if ($field->field != $this->idVar()) { - $query .= ' `'.$field->field.'`=:'.$field->field; + if ($field->field !== $this->idVar()) { + $query .= ' ' . $ident . '=:' . $field->field; } else { - // should proabably be cleaned up a bit + // should probably be cleaned up a bit $query = substr($query, 0, -5); $numset--; } } - $fs[$field->field] = $this->{$field->field}; + $fs[$field->field] = $field->type === 'boolean' + ? $this->_boolForDriver((bool)$this->{$field->field}) + : $this->{$field->field}; $numset++; @@ -385,54 +356,92 @@ public function save($insert = null) { } $query .= !$numset ? '' : ','; - $query .= ' :'.$field->field; + $query .= ' :' . $field->field; $numset++; } $query .= ')'; } else { - $query .= ' WHERE '.$this->idVar().'=:id'; + $query .= ' WHERE ' . $this->db()->quoteIdent($this->idVar()) . '=:id'; $fs['id'] = $this->{$this->idVar()}; } - $stmt = $this->db()->query($query, $fs); + $this->db()->query($query, $fs); if ($insert) { - $this->{$this->idVar()} = $this->db()->db()->lastInsertId($fields[$this->idVar()]->sequence ? $fields[$this->idVar()]->sequence : null); + $this->{$this->idVar()} = $this->db()->db()->lastInsertId( + isset($fields[$this->idVar()]->sequence) ? $fields[$this->idVar()]->sequence : null + ); } return $this; } + private function _prepareBoolField(object $field): void { + $value = $this->{$field->field}; + // Normalize empty strings left over from blank property fills + if ($value === '' || $value === null) { + $value = false; + } + // Keep a real bool on the model; driver literals are applied only when binding + $this->{$field->field} = (bool)$value; + } + + private function _boolForDriver(bool $value): int|string|bool { + // PDO_PGSQL stringifies false as "" which Postgres rejects as boolean input + return match ($this->db()->driver()) { + 'mysql' => $value ? 1 : 0, + 'pgsql' => $value ? 'true' : 'false', + default => $value, + }; + } + + private function _prepareDatetimeField(object $field): void { + if ($this->{$field->field} === '0000-00-00 00:00:00' && $field->null) { + $this->{$field->field} = null; + } + } + + private function _prepareDateField(object $field): void { + if ($this->{$field->field} === '0000-00-00' && $field->null) { + $this->{$field->field} = null; + } + } + /** * Delete a row in a table */ - public function delete() { + public function delete(): static { if ($this->dbId()) { - $this->db()->query('DELETE FROM `'.$this->table().'` WHERE `'.$this->idVar().'` = ?', [$this->dbId()]); + $this->db()->query( + 'DELETE FROM ' . $this->db()->quoteIdent($this->table()) + . ' WHERE ' . $this->db()->quoteIdent($this->idVar()) . ' = ?', + [$this->dbId()] + ); } else { throw new Exception('Cannot delete. No ID was given.'); } return $this; } - public function strip() { + public function strip(): static { $fieldsMeta = $this->fields(); + $fieldNames = []; foreach ($fieldsMeta as $field) { - $fields[] = $field->Field; + $fieldNames[] = $field->field ?? $field->Field ?? ''; } $vars = get_object_vars($this); foreach ($vars as $key => $var) { - if (!in_array($key, $fields) && $key{0} != '_') { + if (!in_array($key, $fieldNames, true) && isset($key[0]) && $key[0] !== '_') { unset($this->$key); } } return $this; } - public function serialize($array) { + public function serialize(array|object $array): static { if (!is_array($array)) { $array = get_object_vars($array); } @@ -444,8 +453,8 @@ public function serialize($array) { return $this; } - public function idVar($id_var = null) { - if (is_null($id_var)) { + public function idVar(?string $id_var = null): static|string|null { + if ($id_var === null) { return $this->_id_var; } else { $this->_id_var = $id_var; @@ -453,8 +462,8 @@ public function idVar($id_var = null) { } } - public function table($table = null) { - if (is_null($table)) { + public function table(?string $table = null): static|string|null { + if ($table === null) { return $this->_table; } else { $this->_table = $table; @@ -462,83 +471,85 @@ public function table($table = null) { } } - public function __o($args) { - $classname = get_called_class(); + public function __o(mixed ...$args): mixed { + $classname = static::class; + $items = []; - foreach (func_get_args() as $arg) { + foreach ($args as $arg) { if (is_array($arg)) { foreach ($arg as $item) { - $items[] = $this->tipsy()->factory($classname,$item); + $items[] = $this->tipsy()->factory($classname, $item); } } else { - $items[] = $this->tipsy()->factory($classname,$arg); + $items[] = $this->tipsy()->factory($classname, $arg); } } foreach ($items as $item) { $item->tipsy($this->tipsy()); - echo get_called_class($item); } - if (count($items) == 1) { + if (count($items) === 1) { return array_pop($items); } else { return new Looper($items); } } - public static function __o_static() { - $classname = get_called_class(); + public static function __o_static(): mixed { + $classname = static::class; + $items = []; foreach (func_get_args() as $arg) { if (is_array($arg)) { foreach ($arg as $item) { - $items[] = Tipsy::factory($classname,$item); + $items[] = Tipsy::factory($classname, $item); } } else { - $items[] = Tipsy::factory($classname,$arg); + $items[] = Tipsy::factory($classname, $arg); } } foreach ($items as $item) { $item->tipsy(Tipsy::app()); } - if (count($items) == 1) { + if (count($items) === 1) { return array_pop($items); } else { return new Looper($items); } } - public static function __q_static() { - return forward_static_call_array([get_called_class(), '__query_static'], func_get_args()); + public static function __q_static(): mixed { + return forward_static_call_array([static::class, '__query_static'], func_get_args()); } - public static function __query_static() { - $name = get_called_class(); + public static function __query_static(): mixed { + $name = static::class; $class = new $name(); $class->tipsy(Tipsy::app()); $class->service($name); return (new \ReflectionMethod($class, '__query'))->invokeArgs($class, func_get_args()); } - public function __q($query) { + public function __q(string $query): mixed { return (new \ReflectionMethod($this, '__query'))->invokeArgs($this, func_get_args()); } - public function __query($query) { + public function __query(string $query): mixed { $args = []; - if (func_num_args() == 2 && is_array(func_get_arg(1))) { + if (func_num_args() === 2 && is_array(func_get_arg(1))) { $args = func_get_arg(1); } elseif (func_num_args() > 1) { - for ($i = 1; $i < func_num_args(); $i++){ + for ($i = 1; $i < func_num_args(); $i++) { $args[] = func_get_arg($i); } } $res = $this->db()->query($query, $args); + $items = []; while ($row = $res->fetch(\PDO::FETCH_ASSOC)) { if ($this->tipsy()->services($this->service())) { $items[] = $this->tipsy()->service($this->service(), $row); @@ -552,23 +563,22 @@ public function __query($query) { return new Looper($items); } - public function tipsy($tipsy = null) { - if (!is_null($tipsy)) { + public function tipsy(?App $tipsy = null): ?App { + if ($tipsy !== null) { $this->_tipsy = $tipsy; } return $this->_tipsy; } - public function db() { - if ($this && $this->tipsy() && $this->tipsy()->db()) { + public function db(): Db { + if ($this->tipsy()?->db()) { return $this->tipsy()->db(); - } else { - return Tipsy::db(); } + return Tipsy::db(); } - public function service($service = null) { - if (!is_null($service)) { + public function service(?string $service = null): ?string { + if ($service !== null) { $this->_service = $service; } return $this->_service; diff --git a/src/Route.php b/src/Route.php index 96d9314..29d650b 100644 --- a/src/Route.php +++ b/src/Route.php @@ -1,5 +1,7 @@ |null Uppercased allowed methods; null means any */ + private ?array $_methods = null; + private ?string $_compiledRegex = null; + /** @var list */ + private array $_paramKeys = []; + private mixed $_controller = null; + private ?DependencyInjector $_controllerRef = null; + + public function __construct(array $args = []) { + $this->_controller = $args['controller'] ?? null; + $this->_caseSensitive = !empty($args['caseSensitive']); + $this->_view = !empty($args['view']); + $this->_tipsy = $args['tipsy'] ?? null; + $this->_method = ($args['method'] ?? '*') === 'all' ? '*' : ($args['method'] ?? '*'); + $this->_routeParams = new RouteParams(); + + if ($this->_method !== '*') { + $methods = []; + foreach (explode(',', $this->_method) as $method) { + $method = strtoupper(trim($method)); + if ($method !== '') { + $methods[] = $method; + } + } + $this->_methods = $methods; + } - public function __construct($args) { - $this->_controller = $args['controller']; - $this->_caseSensitive = $args['caseSensitive'] ? true : false; - $this->_view = $args['view'] ? true : false; + $route = $args['route'] ?? ''; + $this->_compileRoute($route); + } - if ($args['route']{0} == '/' && !@preg_match($args['route'], null)) { - $this->_route = $args['route']; + /** + * Pre-compile route pattern into a regex at construction time. + * Avoids rebuilding regex on every match() call. + */ + private function _compileRoute(string $route): void { + // Check if the route is already a regex (starts with / and is valid preg) + if ($route !== '' && $route[0] === '/' && @preg_match($route, '') !== false) { + $this->_route = $route; $this->_regex = true; - } else { - $this->_route = preg_replace('/^\/?(.*?)\/?$/i','\\1', $args['route']); + $this->_compiledRegex = $route; + return; } - $this->_tipsy = $args['tipsy']; - $this->_method = $args['method'] == 'all' ? '*' : $args['method']; + // Strip leading/trailing slashes for normalized matching + $this->_route = preg_replace('/^\\/?(.*?)\\/?$/i', '\\1', $route) ?? $route; - $this->_routeParams = new RouteParams; - } - - public function match($page) { + // Don't compile empty routes (home page) — handled by direct comparison + if ($this->_route === '' || $this->_route === '/') { + $this->_exact = true; + return; + } - if ($this->method() != '*') { - $methods = explode(',',strtolower($this->method())); - $match = false; + // Extract named parameters (:name) and build regex + $paths = explode('/', $this->_route); + $paramKeys = []; - foreach ($methods as $method) { - if ($method == strtolower($this->tipsy()->request()->method())) { - $match = true; - break; - } - } - - if (!$match) { - return false; + foreach ($paths as $path) { + if (str_starts_with($path, ':')) { + $paramKeys[] = substr($path, 1); } } - // index page - if (($this->_route === '' || $this->_route == '/') && ($page === '' || $page == '/')) { - return $this; - } + $this->_paramKeys = $paramKeys; - $pathParams = []; + // Static route — string compare is cheaper than preg_match + if ($paramKeys === []) { + $this->_exact = true; + return; + } - if ($this->_regex) { - if (preg_match($this->_route, $page, $matches)) { - $this->_routeParams = $matches; - return $this; - } - } else { + // Build the compiled regex once + $r = preg_replace('/:[a-z_]+/i', '([^/]+)', $this->_route); + $r = str_replace('/', '\\/', $r ?? ''); + $flags = $this->_caseSensitive ? '' : 'i'; + $this->_compiledRegex = '/^' . $r . '$/' . $flags; + } - $paths = explode('/',$this->_route); + public function match(string $page): static|string|false { - foreach ($paths as $key => $path) { - if (strpos($path,':') === 0) { - $pathParams[$key] = substr($path,1); - } + if ($this->_methods !== null) { + $requestMethod = $this->_tipsy?->request()->method() ?? 'GET'; + if (!in_array($requestMethod, $this->_methods, true)) { + return false; } + } - $r = preg_replace('/:[a-z_]+/i','.*',$this->_route); - $r = preg_replace('/\//','\/',$r); - - if (preg_match('/^'.$r.'$/'.($this->_caseSensitive ? '' : 'i'),$page)) { - $paths = explode('/',$page); + // Exact / static routes — no regex + if ($this->_exact) { + if ($this->_caseSensitive) { + return $page === $this->_route ? $this : false; + } + return strcasecmp($page, $this->_route) === 0 ? $this : false; + } - foreach ($pathParams as $key => $path) { - $this->_routeParams->{$path} = $paths[$key]; + // User-supplied regex route + if ($this->_regex) { + if (preg_match($this->_compiledRegex, $page, $matches)) { + foreach ($matches as $k => $v) { + $this->_routeParams->{$k} = $v; } - return $this; } + return false; + } + + // Pre-compiled parametric route + if ($this->_compiledRegex !== null && preg_match($this->_compiledRegex, $page, $matches)) { + foreach ($this->_paramKeys as $i => $key) { + $this->_routeParams->{$key} = $matches[$i + 1] ?? ''; + } + return $this; } + return false; } - public function params() { + public function params(): RouteParams|array { return $this->_routeParams; } - public function controller() { + public function controller(): DependencyInjector { if (!isset($this->_controllerRef)) { @@ -101,7 +151,7 @@ public function controller() { ]); $this->_controllerRef = $controller; - } elseif(is_object($this->_controller)) { + } elseif (is_object($this->_controller)) { $this->_controllerRef = $this->_controller; $this->_controllerRef->tipsy($this->tipsy()); @@ -111,7 +161,7 @@ public function controller() { } elseif (is_string($this->_controller) && class_exists($this->_controller)) { - $this->_controllerRef = new $this->_controller(['tipsy' => $this->tipsy()]); + $this->_controllerRef = new ($this->_controller)(['tipsy' => $this->tipsy()]); } if ($this->_controllerRef) { @@ -126,11 +176,14 @@ public function controller() { return $this->_controllerRef; } - public function tipsy() { + public function tipsy(?App $tipsy = null): ?App { + if ($tipsy !== null) { + $this->_tipsy = $tipsy; + } return $this->_tipsy; } - public function method() { + public function method(): string { return $this->_method; } } diff --git a/src/RouteAlias.php b/src/RouteAlias.php index 079844d..dc08d7d 100644 --- a/src/RouteAlias.php +++ b/src/RouteAlias.php @@ -1,41 +1,46 @@ tipsy($args['tipsy']); - - $this->_to = $args['to']; - $this->_from = $args['from']; - - $this->_caseSensitive = false; - $this->_route = preg_replace('/^\/?(.*?)\/?$/i','\\1', $args['from']); - $this->_tipsy = $args['tipsy']; - $this->_method = '*'; - $this->_routeParams = new RouteParams; + protected string $_to = ''; + protected string $_from = ''; + + public function __construct(array $args = []) { + $this->tipsy($args['tipsy'] ?? null); + + $this->_to = $args['to'] ?? ''; + $this->_from = $args['from'] ?? ''; + + // Build parent route configuration + parent::__construct([ + 'route' => $args['from'] ?? '', + 'caseSensitive' => false, + 'method' => '*', + 'tipsy' => $args['tipsy'] ?? null, + ]); } - public function match($page) { + public function match(string $page): string|static|false { if (parent::match($page)) { // remap params and return new route as string $to = explode('/', $this->_to); - foreach ($to as $k => $t) { - foreach ($this->_routeParams->properties() as $key => $value) { - $to[$k] = str_replace(':'.$key, $value, $t); + $params = $this->params(); + if ($params instanceof Scope) { + foreach ($to as $k => $t) { + foreach ($params->properties() as $key => $value) { + $to[$k] = str_replace(':' . $key, (string)$value, $t); + } } } - $to = implode('/', $to); - return $to; + return implode('/', $to); } else { return false; } } - } diff --git a/src/RouteParams.php b/src/RouteParams.php index 42cc3d2..9cf85ef 100644 --- a/src/RouteParams.php +++ b/src/RouteParams.php @@ -1,5 +1,7 @@ _tipsy = $args['tipsy'] ?? null; + } + + /** + * Explicit HTTP verb methods — avoids __call overhead on the hot path. + * __call has ~200ns overhead per invocation on PHP 8.3. + */ + public function get(string $route, callable|array $controller): static { + return $this->_addMethodRoute('GET', $route, $controller); + } + + public function post(string $route, callable|array $controller): static { + return $this->_addMethodRoute('POST', $route, $controller); + } - public function __construct($args = []) { - $this->_routes = []; - $this->_aliass = []; - $this->_tipsy = $args['tipsy']; + public function put(string $route, callable|array $controller): static { + return $this->_addMethodRoute('PUT', $route, $controller); } - public function __call($method, $args = []) { - if (count($args) == 1) { + public function delete(string $route, callable|array $controller): static { + return $this->_addMethodRoute('DELETE', $route, $controller); + } + + public function patch(string $route, callable|array $controller): static { + return $this->_addMethodRoute('PATCH', $route, $controller); + } + + private function _addMethodRoute(string $method, string $route, callable|array $controller): static { + if (is_array($controller) && !is_callable($controller)) { + $controller['method'] = strtoupper($method); + } else { + $controller = [ + 'controller' => $controller, + 'method' => strtoupper($method) + ]; + } + return $this->when($route, $controller); + } + + /** + * Fallback for less common HTTP methods (HEAD, OPTIONS, PATCH, etc.) + */ + public function __call(string $method, array $args = []): static { + if (count($args) === 1) { $args[0]['method'] = strtoupper($method); } else { $args[1] = [ @@ -26,11 +68,11 @@ public function __call($method, $args = []) { 'method' => strtoupper($method) ]; } - return call_user_func_array([$this, 'when'], $args); + return $this->when(...$args); } - public function alias($from, $to) { - $this->_aliass[] = new RouteAlias([ + public function alias(string $from, string $to): static { + $this->_aliases[] = new RouteAlias([ 'to' => $to, 'from' => $from, 'tipsy' => $this->_tipsy @@ -38,7 +80,7 @@ public function alias($from, $to) { return $this; } - public function when($r = null, $args = null) { + public function when(string|array|null $r = null, callable|array|string|object|null $args = null): static { if (is_array($r)) { $route = $r; } else { @@ -49,12 +91,12 @@ public function when($r = null, $args = null) { } $route['route'] = $r; } - if (is_null($route['route'])) { + if (!isset($route['route']) || $route['route'] === null) { throw new Exception('Invalid route specified.'); } $route['tipsy'] = $this->_tipsy; - if (!$route['method']) { + if (empty($route['method'])) { $route['method'] = '*'; } @@ -63,11 +105,11 @@ public function when($r = null, $args = null) { return $this; } - public function home($route) { + public function home(callable|array|string $route): static { return $this->when('', $route); } - public function otherwise($default) { + public function otherwise(callable|array|string $default): void { $this->_default = new Route([ 'controller' => $default, 'method' => '*', @@ -75,32 +117,40 @@ public function otherwise($default) { ]); } - public function match($page) { - foreach (array_reverse($this->aliass(), true) as $route) { - if ($alias = $route->match($page)) { + public function match(string $page): Route { + // Last-registered wins — iterate backwards without array_reverse() allocations + for ($i = count($this->_aliases) - 1; $i >= 0; $i--) { + $alias = $this->_aliases[$i]->match($page); + if ($alias) { $page = $alias; break; } } - foreach (array_reverse($this->routes(), true) as $route) { - if ($route->match($page)) { - return $route; + + for ($i = count($this->_routes) - 1; $i >= 0; $i--) { + if ($this->_routes[$i]->match($page)) { + return $this->_routes[$i]; } } return $this->defaultRoute(); } - public function routes($routes = null) { + /** + * @return Route[] + */ + public function routes(): array { return $this->_routes; } - public function aliass($aliass = null) { - return $this->_aliass; + /** + * @return RouteAlias[] + */ + public function aliases(): array { + return $this->_aliases; } - public function defaultRoute() { - return $this->_default ? $this->_default : new Route(['tipsy' => $this->_tipsy]); + public function defaultRoute(): Route { + return $this->_default ?? new Route(['tipsy' => $this->_tipsy]); } - } diff --git a/src/Scope.php b/src/Scope.php index 58110fb..ad94d6e 100644 --- a/src/Scope.php +++ b/src/Scope.php @@ -1,23 +1,26 @@ _properties = []; - } + private array $_properties = []; - public function &__get($name) { + public function &__get(string $name): mixed { return $this->_properties[$name]; } - public function __set($name, $value) { - return $this->_properties[$name] = $value; + public function __set(string $name, mixed $value): void { + $this->_properties[$name] = $value; } - - public function &properties() { + + public function __isset(string $name): bool { + return isset($this->_properties[$name]); + } + + public function &properties(): array { return $this->_properties; } } \ No newline at end of file diff --git a/src/Service.php b/src/Service.php index 35e2e59..450ad81 100644 --- a/src/Service.php +++ b/src/Service.php @@ -1,11 +1,14 @@ closure()) { - return $this->inject($this->closure(), $this->_scope); + return $this->inject($this->closure(), $this->_scope ?? null); } + return null; } } \ No newline at end of file diff --git a/src/Tipsy.php b/src/Tipsy.php index c8e1b11..ae1926a 100644 --- a/src/Tipsy.php +++ b/src/Tipsy.php @@ -1,67 +1,60 @@ invokeArgs(self::app(), $arguments); - return call_user_func_array([self::app(), $name], $arguments); + public static function __callStatic(string $name, array $arguments): mixed { + return static::app()->$name(...$arguments); } - public function __call($name, $arguments) { - //return (new \ReflectionMethod(self::app(), $name))->invokeArgs(self::app(), $arguments); - return call_user_func_array([self::app(), $name], $arguments); + public function __call(string $name, array $arguments): mixed { + return static::app()->$name(...$arguments); } } -class_alias('\Tipsy\Tipsy', 't'); +class_alias(Tipsy::class, 't'); -// useful for nginx +// Polyfill for nginx — kept for server compatibility if (!function_exists('getallheaders')) { - function getallheaders() { + function getallheaders(): array { if (!is_array($_SERVER)) { return []; } $headers = []; foreach ($_SERVER as $name => $value) { - if (substr($name, 0, 5) == 'HTTP_') { + if (str_starts_with($name, 'HTTP_')) { $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value; } } diff --git a/src/View.php b/src/View.php index 6fcb0fc..33124d4 100644 --- a/src/View.php +++ b/src/View.php @@ -1,27 +1,30 @@ headers = []; + private string $_layout = 'layout'; + private ?array $_headers = null; + private bool $_rendering = false; + private ?array $_stack = null; + private string $_path = ''; + private ?App $_tipsy = null; + private array $_filters = []; + private string $_extension = '.phtml'; + private ?Scope $_scope = null; + public ?string $content = null; + + public function __construct(array $args = []) { + $this->_headers = []; $this->config($args); - $this->_tipsy = $args['tipsy']; - $this->_scope = $scope; + $this->_tipsy = $args['tipsy'] ?? null; } - public function config($args = null) { + public function config(array $args = []): void { if (isset($args['layout'])) { $this->_layout = $args['layout']; } @@ -41,62 +44,58 @@ public function config($args = null) { } } - public function stack() { - $stack = $this->tipsy()->config()['view']['stack']; + public function stack(): array { + $stack = $this->tipsy()?->config()['view']['stack'] ?? null; if (!$stack) { $stack = ['']; } return $stack; } - public function mtime($file) { - return filemtime($this->file($file)); + public function mtime(string $file): int|false { + $resolved = $this->file($file); + return $resolved ? filemtime($resolved) : false; } - public function file($src) { + public function file(string $src): ?string { $stack = $this->stack(); // absolute path - if ($src{0} == '/' && file_exists($src)) { + if (isset($src[0]) && $src[0] === '/' && file_exists($src)) { return $src; } foreach ($stack as $dir) { - $path = self::joinPaths($this->_path, $dir, $src.$this->_extension); + $path = self::joinPaths($this->_path, $dir, $src . $this->_extension); if (file_exists($path) && is_file($path)) { - $file = $path; - break; + return $path; } $path = self::joinPaths($this->_path, $dir, $src); if (file_exists($path) && is_file($path)) { - $file = $path; - break; + return $path; } } - return $file; + return null; } - private static function joinPaths() { - $args = func_get_args(); + private static function joinPaths(string ...$parts): string { $paths = []; - foreach ($args as $arg) { - $paths = array_merge($paths, (array)$arg); + $isAbsolute = isset($parts[0]) && str_starts_with($parts[0], '/'); + foreach ($parts as $arg) { + $paths[] = trim($arg, '/'); } - - $paths = array_map(function($p) { - return trim($p, '/'); - }, $paths); $paths = array_filter($paths); - return join('/', $paths); + $path = implode('/', $paths); + return $isAbsolute ? '/' . $path : $path; } - public function layout() { + public function layout(): ?string { return $this->file($this->_layout); } - public function render($view, $params = null, $display = false) { - if (isset($params)) { + public function render(string $view, ?array $params = null, bool $display = false): string { + if ($params !== null) { foreach ($params as $key => $value) { $this->scope()->{$key} = $value; } @@ -104,7 +103,7 @@ public function render($view, $params = null, $display = false) { $file = $this->file($view); if (!$file) { - throw new Exception('Could not find view file: "'.$view.'" in "'.(implode(',',$this->stack())).'"'); + throw new Exception('Could not find view file: "' . $view . '" in "' . (implode(',', $this->stack())) . '"'); } $layout = $this->layout(); @@ -115,11 +114,11 @@ public function render($view, $params = null, $display = false) { $difVars = get_defined_vars(); - $include = function($view, $scope = []) use ($difVars, $p) { + $include = function(string $view, array $scope = []) use ($difVars, $p): string { $use = []; foreach ($scope as $k => $var) { - if ($scope[$k] != $difVars[$k] && !in_array($k, ['Request', 'difVars', 'include'])) { + if (($scope[$k] ?? null) !== ($difVars[$k] ?? null) && !in_array($k, ['Request', 'difVars', 'include'], true)) { $use[$k] = $var; } } @@ -128,13 +127,13 @@ public function render($view, $params = null, $display = false) { }; // @todo: add all the other services - $Request = $this->tipsy()->request(); + $Request = $this->tipsy()?->request(); if ($this->_rendering || !isset($display)) { ob_start(); include($file); - $page = $this->filterContent(ob_get_contents()); + $page = $this->filterContent(ob_get_contents() ?: ''); ob_end_clean(); } else { @@ -142,13 +141,13 @@ public function render($view, $params = null, $display = false) { $this->_rendering = true; ob_start(); include($file); - $this->content = $this->filterContent(ob_get_contents()); + $this->content = $this->filterContent(ob_get_contents() ?: ''); ob_end_clean(); if ($layout) { ob_start(); include($layout); - $page = $this->filterContent(ob_get_contents()); + $page = $this->filterContent(ob_get_contents() ?: ''); ob_end_clean(); $this->_rendering = false; } else { @@ -156,27 +155,22 @@ public function render($view, $params = null, $display = false) { } } - /* directly modify view variables. i dont think we need this - if (isset($params['var'])) { - $this->{$params['var']} = $page; - } - */ - return $page; + return $page ?? ''; } - public function display($view, $params = null) { + public function display(string $view, ?array $params = null): void { echo $this->render($view, $params, true); } - public function filterContent($content) { + public function filterContent(string $content): string { foreach ($this->_filters as $filter) { if (is_callable($filter['filter'])) { $content = $filter['filter']($content, $filter['arguments']); - } else if (is_string($filter['filter'])) { + } elseif (is_string($filter['filter'])) { if (class_exists($filter['filter'])) { $content = $filter['filter']::filter($content, $filter['arguments']); } else { - throw new Exception('Filter class "'.$filter['filter'].'" doest not exist.'); + throw new Exception('Filter class "' . $filter['filter'] . '" does not exist.'); } } else { throw new Exception('Invalid filter.'); @@ -185,24 +179,27 @@ public function filterContent($content) { return $content; } - public function tipsy() { + public function tipsy(): ?App { return $this->_tipsy; } - public function scope(&$scope = null) { - if ($scope) { + public function scope(?Scope &$scope = null): Scope { + if ($scope !== null) { $this->_scope = $scope; } + if ($this->_scope === null) { + $this->_scope = new Scope(); + } return $this->_scope; } - public function filter($filter, $arguments = []) { + public function filter(callable|string|null $filter, array $arguments = []): mixed { if ($filter) { $this->_filters[] = [ 'filter' => $filter, 'arguments' => $arguments ]; } - return $this->_filter; + return $this->_filters; } } diff --git a/src/View/Filter.php b/src/View/Filter.php index 2391e93..0eba8e2 100644 --- a/src/View/Filter.php +++ b/src/View/Filter.php @@ -1,7 +1,11 @@ tip = new Tipsy\Tipsy; $this->useOb = true; } @@ -14,8 +15,9 @@ public function testRouterAnonymousClass() { $this->tip->router() ->when('router/library', new class() extends Tipsy\Controller { - public function init($args = null) { + public function init(array $args = []): mixed { echo 'ANONY'; + return null; } }); $this->tip->start(); diff --git a/tests/ServicePHP7.php b/tests/AnonymousServiceTest.php similarity index 88% rename from tests/ServicePHP7.php rename to tests/AnonymousServiceTest.php index a29fe67..17cfbc8 100644 --- a/tests/ServicePHP7.php +++ b/tests/AnonymousServiceTest.php @@ -1,8 +1,9 @@ tip = new Tipsy\Tipsy; $this->useOb = true; } @@ -31,8 +32,9 @@ public function testMiddlewareAnonymousClass() { $this->ob(); $this->tip->middleware(new class() extends \Tipsy\Middleware { - public function run($args = null) { + public function run(mixed $args = null): mixed { echo 'MIDDLEWARE'; + return null; } }); diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php index 6a13ff3..e15f08b 100644 --- a/tests/ConfigTest.php +++ b/tests/ConfigTest.php @@ -1,7 +1,8 @@ tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use } diff --git a/tests/DBTest.php b/tests/DBTest.php index 8671240..e67ee48 100644 --- a/tests/DBTest.php +++ b/tests/DBTest.php @@ -14,13 +14,14 @@ public function __construct($id = null) { class DBTest extends Tipsy_Test { - public static function setUpBeforeClass() { + public static function setUpBeforeClass(): void { } - public static function tearDownAfterClass() { + public static function tearDownAfterClass(): void { } - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; @@ -31,10 +32,10 @@ public function setUp() { public function testDBCreateTable() { $this->tip->service('Tipsy\Resource/TestUser', [ - _id => 'id', - _table => 'test_user', - _fields => [ - id => (object)[ + '_id' => 'id', + '_table' => 'test_user', + '_fields' => [ + 'id' => (object)[ 'field' => 'id', 'type' => 'int', 'null' => false, @@ -42,19 +43,19 @@ public function testDBCreateTable() { 'length' => 11, 'unsigned' => true ], - name => (object)[ + 'name' => (object)[ 'field' => 'name', 'type' => 'char', 'null' => true, 'length' => 255, 'default' => 'user' ], - username => (object)[ + 'username' => (object)[ 'field' => 'username', 'type' => 'char', 'null' => true ], - active => (object)[ + 'active' => (object)[ 'field' => 'active', 'type' => 'bool', 'null' => false, @@ -65,10 +66,10 @@ public function testDBCreateTable() { $this->tip->service('TestUser')->dropTable(); $this->tip->service('Tipsy\Resource/TestUser2', [ - _id => 'id', - _table => 'test_user2', - _fields => [ - id => (object)[ + '_id' => 'id', + '_table' => 'test_user2', + '_fields' => [ + 'id' => (object)[ 'field' => 'id', 'type' => 'int', 'null' => false, @@ -76,14 +77,14 @@ public function testDBCreateTable() { 'length' => 11, 'unsigned' => true ], - name => (object)[ + 'name' => (object)[ 'field' => 'name', 'type' => 'char', 'null' => true, 'length' => 255, 'default' => 'user' ], - username => (object)[ + 'username' => (object)[ 'field' => 'username', 'type' => 'char', 'null' => true @@ -130,11 +131,11 @@ public function testDBCreateTable() { public function testModelDBOExtendCall() { $this->tip->service('Tipsy\Resource/TestModel', [ - test => function() { + 'test' => function() { return $this->test; }, - _id => 'id_test_user', - _table => 'test_user' + '_id' => 'id_test_user', + '_table' => 'test_user' ]); $m = $this->tip->service('TestModel'); @@ -145,8 +146,8 @@ public function testModelDBOExtendCall() { public function testModelDBOIdLoad() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -160,8 +161,8 @@ public function testModelDBOIdLoad() { public function testModelDBOIdCreate() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -174,8 +175,8 @@ public function testModelDBOIdCreate() { public function testModelDBOIdSave() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -194,8 +195,8 @@ public function testModelDBOIdSave() { public function testModelDBOQuery() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -210,8 +211,8 @@ public function testModelDBOQuery() { public function testModelDBODelete() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -243,11 +244,11 @@ public function testModelDBOExtendRoute() { $_REQUEST['__url'] = 'user/create'; $this->tip->service('Tipsy\Resource/TestModel', [ - test => function($user) { + 'test' => function($user) { return $this->test; }, - _id => 'id', - _table => 'test_user' + '_id' => 'id', + '_table' => 'test_user' ]); $this->tip->router() @@ -289,8 +290,8 @@ public function testResourceClassOverwrite() { public function testModelJsonExport() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -311,11 +312,11 @@ public function testModelJsonExport() { public function testExtend() { $this->tip->service('Tipsy\Resource/TestModel', [ - exports => function() { - return [test => true]; + 'exports' => function() { + return ['test' => true]; }, - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -325,13 +326,13 @@ public function testExtend() { public function testModelDBOAutoTable() { $_REQUEST['__url'] = 'user/1'; - $this->tip->db()->query('DROP TABLE IF EXISTS `test_auto_user`'); + $this->tip->db()->query('DROP TABLE IF EXISTS ' . $this->tip->db()->quoteIdent('test_auto_user')); $this->tip->service('Tipsy\Resource/TestUser', [ - _id => 'id', - _table => 'test_auto_user', - _fields => [ - id => (object)[ + '_id' => 'id', + '_table' => 'test_auto_user', + '_fields' => [ + 'id' => (object)[ 'field' => 'id', 'type' => 'int', 'null' => false, @@ -339,24 +340,24 @@ public function testModelDBOAutoTable() { 'length' => 11, 'unsigned' => true ], - age => (object)[ + 'age' => (object)[ 'field' => 'age', 'type' => 'int', 'default' => 0 ], - first_name => (object)[ + 'first_name' => (object)[ 'field' => 'first_name', 'type' => 'char', 'null' => true, 'length' => 255, 'default' => 'user' ], - last_name => (object)[ + 'last_name' => (object)[ 'field' => 'last_name', 'type' => 'char', 'null' => true ], - active => (object)[ + 'active' => (object)[ 'field' => 'active', 'type' => 'bool', 'null' => false, @@ -368,7 +369,7 @@ public function testModelDBOAutoTable() { $this->tip->router() ->when('user/:id', function($Params, $TestUser) use (&$res) { $u = $TestUser->create([ - last_name => 'name' + 'last_name' => 'name' ]); $id = $u->id; $u = null; @@ -383,8 +384,8 @@ public function testModelDBOAutoTable() { public function testResourceGetGet() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user2' + '_id' => 'id', + '_table' => 'test_user2' ]); $m = $this->tip->service('TestModel'); @@ -394,8 +395,8 @@ public function testResourceGetGet() { public function testResourceCreateTableFail() { $this->tip->service('Tipsy\Resource/TestModel', [ - _id => 'id', - _table => 'test_user_fail' + '_id' => 'id', + '_table' => 'test_user_fail' ]); try { @@ -408,7 +409,7 @@ public function testResourceCreateTableFail() { public function testResourceCreateObject() { $o = new ClassResourceTest((object)[ - name => 'devin' + 'name' => 'devin' ]); $this->assertEquals('devin', $o->name); } @@ -435,7 +436,7 @@ public function testResourceReload() { public function testResourceSerialize() { $o = ClassResourceTest::q('select * from test_user limit 1')->get(0); $o->serialize([ - name => 'newarray' + 'name' => 'newarray' ]); $this->assertEquals('newarray', $o->name); } @@ -443,7 +444,7 @@ public function testResourceSerialize() { public function testResourceSerializeObject() { $o = ClassResourceTest::q('select * from test_user limit 1')->get(0); $o->serialize((object)[ - name => 'newobject' + 'name' => 'newobject' ]); $this->assertEquals('newobject', $o->name); } diff --git a/tests/DBUrlTest.php b/tests/DBUrlTest.php index 2b76212..cb8a4cb 100644 --- a/tests/DBUrlTest.php +++ b/tests/DBUrlTest.php @@ -3,19 +3,20 @@ class DBUrlTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use $this->tip->config('tests/config.ini'); $this->setupDb($this->tip); - $url = ($this->tip->config()['db']['driver'] ? $this->tip->config()['db']['driver'] : 'mysql').'://'.$this->tip->config()['db']['user'].($this->tip->config()['db']['pass'] ? ':'.$this->tip->config()['db']['pass'] : '').'@'.$this->tip->config()['db']['host'].'/'.$this->tip->config()['db']['database'].'?persistent=true&something=else'; + $url = ($this->tip->config()['db']['driver'] ?? 'pgsql').'://'.$this->tip->config()['db']['user'].($this->tip->config()['db']['pass'] ? ':'.$this->tip->config()['db']['pass'] : '').'@'.$this->tip->config()['db']['host'].'/'.$this->tip->config()['db']['database'].'?persistent=true&something=else'; // rebuild $this->tip = new Tipsy\Tipsy; $this->tip->config('tests/config.ini'); - $this->tip->config([db => [url => $url]]); + $this->tip->config(['db' => ['url' => $url]]); } public function testDbUrl() { diff --git a/tests/DependencyInjectorTest.php b/tests/DependencyInjectorTest.php index 15610a8..d51ae90 100644 --- a/tests/DependencyInjectorTest.php +++ b/tests/DependencyInjectorTest.php @@ -2,7 +2,8 @@ class DependencyInjectorTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use diff --git a/tests/FactoryTest.php b/tests/FactoryTest.php index ac99d5b..43e8ced 100644 --- a/tests/FactoryTest.php +++ b/tests/FactoryTest.php @@ -17,7 +17,8 @@ public function __construct($id = null) { } class FactoryTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->tip->config('tests/config.ini'); $this->setupDb($this->tip); @@ -99,7 +100,7 @@ public function testStaticRef() { public function testStaticRefMulti() { $this->markTestSkipped('Test incomplete'); - $l = factoryResource::o(1,2,[id => 3, name => 'new']); + $l = factoryResource::o(1,2,['id' => 3, 'name' => 'new']); $this->assertEquals(1, $l->dbId()); $this->assertEquals(2, $l->dbId()); @@ -109,7 +110,7 @@ public function testStaticRefMulti() { public function testObjRefMulti() { $this->markTestSkipped('Test incomplete'); $m = new factoryResource; - $l = $m->o(1,2,[id => 3, name => 'new']); + $l = $m->o(1,2,['id' => 3, 'name' => 'new']); $this->assertEquals(1, $l->dbId()); $this->assertEquals(2, $l->dbId()); @@ -117,7 +118,7 @@ public function testObjRefMulti() { } public function testObjAuto() { - return; + $this->markTestSkipped('Test incomplete'); $m = new factoryResource; $a = $m->o(1); $a->first = true; diff --git a/tests/HeaderTest.php b/tests/HeaderTest.php index 99942e0..7993814 100644 --- a/tests/HeaderTest.php +++ b/tests/HeaderTest.php @@ -2,7 +2,8 @@ class HeaderTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use } diff --git a/tests/HttpTest.php b/tests/HttpTest.php index 730dbb2..64da36b 100644 --- a/tests/HttpTest.php +++ b/tests/HttpTest.php @@ -1,58 +1,57 @@ tip = new Tipsy\Tipsy; - $this->host = 'http://localhost:8000/'; - //$this->host = 'http://192.168.99.100:8000/'; - //$this->host = 'http://tipsy-http-test.localhost/'; + $this->host = 'http://127.0.0.1:8000/'; } public function testFormGetJson() { - $http = (new Tipsy\Http())->get($this->host.'item/1/json', [key => 'value'], [type => 'form'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->get($this->host.'item/1/json', ['key' => 'value'], ['type' => 'form'])->complete(function($data) use (&$res) { $res = $data; }); - $this->assertEquals($res, (object)[id => 1, key => 'value', method => 'get']); + $this->assertEquals($res, (object)["id" => 1, "key" => "value", "method" => "get"]); } public function testFormPostJson() { - $http = (new Tipsy\Http())->post($this->host.'item/1/json', [key => 'value'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->post($this->host.'item/1/json', ['key' => 'value'])->complete(function($data) use (&$res) { $res = $data; }); - $this->assertEquals($res, (object)[id => 1, key => 'value', method => 'post']); + $this->assertEquals($res, (object)["id" => 1, "key" => "value", "method" => "post"]); } public function testFormGetPlain() { - $http = (new Tipsy\Http())->get($this->host.'item/1/plain', [key => 'value'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->get($this->host.'item/1/plain', ['key' => 'value'])->complete(function($data) use (&$res) { $res = $data; }); $this->assertEquals($res, '1.value.get'); } public function testFormPostPlain() { - $http = (new Tipsy\Http())->post($this->host.'item/1/plain', [key => 'value'], [type => 'form'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->post($this->host.'item/1/plain', ['key' => 'value'], ['type' => 'form'])->complete(function($data) use (&$res) { $res = $data; }); $this->assertEquals($res, '1.value.post'); } public function testJsonGetJson() { - $http = (new Tipsy\Http())->get($this->host.'item/1/json', [key => 'value'], [type => 'json'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->get($this->host.'item/1/json', ['key' => 'value'], ['type' => 'json'])->complete(function($data) use (&$res) { $res = $data; }); - $this->assertEquals($res, (object)[id => 1, key => 'value', method => 'get']); + $this->assertEquals($res, (object)["id" => 1, "key" => "value", "method" => "get"]); } public function testJsonPostJson() { $this->markTestSkipped('Test incomplete'); - $http = (new Tipsy\Http())->post($this->host.'item/1/json', [key => 'value'], [type => 'json'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->post($this->host.'item/1/json', ['key' => 'value'], ['type' => 'json'])->complete(function($data) use (&$res) { $res = $data; }); - $this->assertEquals($res, (object)[id => 1, key => 'value', method => 'post']); + $this->assertEquals($res, (object)["id" => 1, "key" => "value", "method" => "post"]); } public function testJsonGetPlain() { - $http = (new Tipsy\Http())->get($this->host.'item/1/plain', [key => 'value'], [type => 'json'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->get($this->host.'item/1/plain', ['key' => 'value'], ['type' => 'json'])->complete(function($data) use (&$res) { $res = $data; }); $this->assertEquals($res, '1.value.get'); @@ -60,7 +59,7 @@ public function testJsonGetPlain() { public function testJsonPostPlain() { $this->markTestSkipped('Test incomplete'); - $http = (new Tipsy\Http())->post($this->host.'item/1/plain', [key => 'value'], [type => 'json'])->complete(function($data) use (&$res) { + $http = (new Tipsy\Http())->post($this->host.'item/1/plain', ['key' => 'value'], ['type' => 'json'])->complete(function($data) use (&$res) { $res = $data; }); $this->assertEquals($res, '1.value.post'); @@ -101,36 +100,36 @@ public function testSuccess() { } public function testKwargsCopy() { - $http = (new Tipsy\Http())->post($this->host.'item/1/json', [key => 'value']) + $http = (new Tipsy\Http())->post($this->host.'item/1/json', ['key' => 'value']) ->complete(function($data) use (&$res) { $res = $data; }); - $this->assertEquals($res, (object)[id => 1, key => 'value', method => 'post']); + $this->assertEquals($res, (object)["id" => 1, "key" => "value", "method" => "post"]); } public function testKwargs() { $http = (new Tipsy\Http())->request([ - url => $this->host.'item/1/json', - method => 'post', - data => [key => 'value'] + 'url' => $this->host.'item/1/json', + 'method' => 'post', + 'data' => ['key' => 'value'] ]) ->complete(function($data) use (&$res) { $res = $data; }); - $this->assertEquals($res, (object)[id => 1, key => 'value', method => 'post']); + $this->assertEquals($res, (object)["id" => 1, "key" => "value", "method" => "post"]); } public function testKwargsMethod() { $http = (new Tipsy\Http())->get([ - url => $this->host.'item/1/json', - data => [key => 'value'] + 'url' => $this->host.'item/1/json', + 'data' => ['key' => 'value'] ]) ->complete(function($data) use (&$res) { $res = $data; }); - $this->assertEquals($res, (object)[id => 1, key => 'value', method => 'get']); + $this->assertEquals($res, (object)["id" => 1, "key" => "value", "method" => "get"]); } } diff --git a/tests/Issue0025Test.php b/tests/Issue0025Test.php index 0412466..3f20f82 100644 --- a/tests/Issue0025Test.php +++ b/tests/Issue0025Test.php @@ -31,7 +31,8 @@ public function __construct($id = null) { class Issue0025Test extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->tip->config('tests/config.ini'); diff --git a/tests/LooperTest.php b/tests/LooperTest.php index 7d93cde..8624c46 100644 --- a/tests/LooperTest.php +++ b/tests/LooperTest.php @@ -30,7 +30,8 @@ public function __construct($d = null) { class LooperTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use diff --git a/tests/MiddlewareTest.php b/tests/MiddlewareTest.php index cd5f5e9..82e38b6 100644 --- a/tests/MiddlewareTest.php +++ b/tests/MiddlewareTest.php @@ -4,13 +4,14 @@ class LoginServiceMiddleware extends \Tipsy\Middleware { function __construct() { echo 'SERVICECONSTRUCT'; } - function run($test = null) { + function run(mixed $test = null): mixed { echo 'SERVICERUN'.$test['test']; + return null; } } class MiddlewareClassFailure extends \Tipsy\Middleware { - function run($test = null) { + function run(mixed $test = null): mixed { return false; } } @@ -21,7 +22,8 @@ class MiddlewareClassDefault extends \Tipsy\Middleware { class MiddlewareTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use } @@ -52,10 +54,10 @@ public function testMiddlewareTipsy() { $this->ob(); $this->tip->service('Tipsy\Service/LoginServiceTipsy', [ - run => function() { + 'run' => function() { echo 'HI'; }, - test => function() { + 'test' => function() { return 'HELLO'; } ]); @@ -81,10 +83,10 @@ public function testMiddlewareTipsyDirect() { $this->ob(); $this->tip->middleware('Tipsy\Service/LoginServiceTipsy', [ - run => function() { + 'run' => function() { echo 'HI'; }, - test => function() { + 'test' => function() { return 'HELLO'; } ]); @@ -109,7 +111,7 @@ public function testMiddlewareFailure() { $_REQUEST['__url'] = ''; $this->tip->service('Tipsy\Service/MiddlewareException', [ - run => function() { + 'run' => function() { return false; } ]); @@ -169,13 +171,13 @@ public function testMiddlewareClassDefault() { public function testMiddlewareClosure() { $this->ob(); $this->tip->service('Service', [ - test => function() { + 'test' => function() { echo 'CLOSURE'; } ]); $this->tip->middleware('Closure', function($Service) { return [ - run => function() use ($Service) { + 'run' => function() use ($Service) { $Service->test(); } ]; @@ -191,14 +193,14 @@ public function testMiddlewareToMiddlewareReference() { $this->ob(); $this->tip->middleware('Tipsy\Service/FirstService', [ - test => function() { + 'test' => function() { return 'HELLO'; } ]); $this->tip->middleware('Tipsy\Service/SecondService', function($FirstService) { return [ - test => function() use ($FirstService) { + 'test' => function() use ($FirstService) { return $FirstService->test(); } ]; @@ -206,6 +208,7 @@ public function testMiddlewareToMiddlewareReference() { $this->tip->router()->home(function() {}); $this->tip->start(); + $this->ob(false); $check = $this->tip->middleware('SecondService')->test(); $this->assertEquals('HELLO', $check); @@ -216,7 +219,7 @@ public function testMiddlewarePromise() { $this->tip->router()->otherwise(function() {}); $this->tip->start(); $this->tip->middleware('Promise', [ - run => function() { + 'run' => function() { echo 'PROMISE'; } ]); diff --git a/tests/ModelTest.php b/tests/ModelTest.php index 42335f9..c35b1cf 100644 --- a/tests/ModelTest.php +++ b/tests/ModelTest.php @@ -20,7 +20,8 @@ class TestModelStaticFail extends Tipsy\Model { class ModelTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use diff --git a/tests/RequestTest.php b/tests/RequestTest.php index a61f3bc..ee15f98 100644 --- a/tests/RequestTest.php +++ b/tests/RequestTest.php @@ -2,7 +2,8 @@ class RequestTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; } diff --git a/tests/RestTest.php b/tests/RestTest.php index 0a741a6..85e53e4 100644 --- a/tests/RestTest.php +++ b/tests/RestTest.php @@ -3,7 +3,8 @@ class RestTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use @@ -211,8 +212,8 @@ public function testPostSave() { $_POST['name'] = 'maitai'; $this->tip->service('Tipsy\Resource/Drink', [ - _id => 'id', - _table => 'test_user' + '_id' => 'id', + '_table' => 'test_user' ]); $this->tip->post('drink/:id',function($Drink, $Request, $Params) { diff --git a/tests/RouterTest.php b/tests/RouterTest.php index d427fca..3b49687 100644 --- a/tests/RouterTest.php +++ b/tests/RouterTest.php @@ -2,29 +2,33 @@ // class for library controller test class LibraryController extends Tipsy\Controller { - public function init($args = []) { + public function init(array $args = []): mixed { echo 'LIBRARY'; + return null; } } // class for instance controller test class InstanceController extends Tipsy\Controller { - public function init($args = []) { + public function init(array $args = []): mixed { echo 'INSTANCE'; + return null; } } class LibraryControllerParent extends Tipsy\Controller { - public function init($args = []) { + public function init(array $args = []): mixed { parent::init($args); echo 'LIBRARY'; + return null; } } class RouterTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use } @@ -605,6 +609,41 @@ public function testRegex() { $this->assertTrue($res); } + public function testParamIsSegmentBound() { + $_REQUEST['__url'] = 'item/1/extra'; + $_SERVER['REQUEST_METHOD'] = 'GET'; + + $this->ob(); + + $this->tip->router() + ->when('item/:id', function($Params) { + echo 'MATCH:'.$Params->id; + }) + ->otherwise(function() { + echo 'OTHER'; + }); + $this->tip->start(); + + $check = $this->ob(false); + $this->assertEquals('OTHER', $check); + } + + public function testParamSingleSegment() { + $_REQUEST['__url'] = 'item/42'; + $_SERVER['REQUEST_METHOD'] = 'GET'; + + $this->ob(); + + $this->tip->router() + ->when('item/:id', function($Params) { + echo $Params->id; + }); + $this->tip->start(); + + $check = $this->ob(false); + $this->assertEquals('42', $check); + } + public function testRegexSuffix() { $_REQUEST['__url'] = 'assets/app.scss'; $_SERVER['REQUEST_METHOD'] = 'GET'; diff --git a/tests/ServiceTest.php b/tests/ServiceTest.php index 2415b83..31b381d 100644 --- a/tests/ServiceTest.php +++ b/tests/ServiceTest.php @@ -12,7 +12,8 @@ function stuff($stuff) { class ServiceTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use } @@ -29,7 +30,7 @@ public function testServiceClass() { public function testServiceExtend() { $_REQUEST['__url'] = ''; $this->tip->service('LoginService/Second', [ - test => function() { + 'test' => function() { return 'SECOND'; } ]); diff --git a/tests/StaticyTest.php b/tests/StaticyTest.php index 17be311..ac6de9c 100644 --- a/tests/StaticyTest.php +++ b/tests/StaticyTest.php @@ -12,7 +12,8 @@ function test() { class StaticyTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->useOb = true; // for debug use } diff --git a/tests/ViewFilterTest.php b/tests/ViewFilterTest.php index 190f1d2..1a11514 100644 --- a/tests/ViewFilterTest.php +++ b/tests/ViewFilterTest.php @@ -1,7 +1,7 @@ tip = new Tipsy\Tipsy; $this->useOb = true; $this->tip->config(['view' => [ @@ -97,7 +98,7 @@ public function testViewFilterClassFail() { $this->tip->start(); ob_end_clean(); - $this->assertEquals('Filter class "FAIL" doest not exist.', trim($res)); + $this->assertEquals('Filter class "FAIL" does not exist.', trim($res)); } public function testViewFilterFail() { @@ -116,6 +117,6 @@ public function testViewFilterFail() { $this->tip->start(); ob_end_clean(); - $this->assertEquals('Invalid filter.', trim($res)); + $this->assertEquals('Filter class "12" does not exist.', trim($res)); } } diff --git a/tests/ViewTest.php b/tests/ViewTest.php index 9a5ba50..95680f3 100644 --- a/tests/ViewTest.php +++ b/tests/ViewTest.php @@ -3,7 +3,8 @@ class ViewTest extends Tipsy_Test { - public function setUp() { + public function setUp(): void { + parent::setUp(); $this->tip = new Tipsy\Tipsy; $this->useOb = true; // for debug use } @@ -206,7 +207,7 @@ public function testViewScopeDirect() { $this->ob(); $this->tip->router() ->when('router/view', function($View, $Scope) { - $View->render('PrintTest', [test => 'ONE']); + $View->render('PrintTest', ['test' => 'ONE']); echo $Scope->test; }); $this->tip->start(); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 7d7db55..5e07a93 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,34 +1,39 @@ config('tests/config.db.'.(getenv('TRAVIS') ? 'travis' : 'local').'.'.(getenv('DB') ? getenv('DB') : 'mysql' ).'.ini'); + protected function setUp(): void { + $_REQUEST = []; + $_GET = []; + $_POST = []; + $_SERVER['REQUEST_URI'] = ''; + $_SERVER['SCRIPT_NAME'] = ''; + } - if (getenv('DB') == 'pgsql') { - $this->tip->service('Db', 'Tipsy\Db\MysqlToPgsql'); - } + public function setupDb(Tipsy\Tipsy $tipsy): void { + // Default DB is Postgres (Tipsy 2.0). Set DB=mysql for the MySQL matrix. + $tipsy->config('tests/config.db.' . (getenv('CI') ? 'ci' : 'local') . '.' . (getenv('DB') ?: 'pgsql') . '.ini'); } - public function ob($start = true) { + public function ob(bool $start = true): ?string { if (!$this->useOb) { - return; + return null; } if ($start) { ob_clean(); ob_start(); + return null; } else { $check = ob_get_contents(); if (!$this->useOb) { @@ -37,7 +42,7 @@ public function ob($start = true) { ob_end_clean(); } - return $check; + return $check ?: null; } } } diff --git a/tests/config.db.ci.mysql.ini b/tests/config.db.ci.mysql.ini new file mode 100644 index 0000000..0094b85 --- /dev/null +++ b/tests/config.db.ci.mysql.ini @@ -0,0 +1,6 @@ +[db] +host=127.0.0.1 +user=root +pass= +database=tipsy +driver=mysql diff --git a/tests/config.db.travis.pgsql.ini b/tests/config.db.ci.pgsql.ini similarity index 77% rename from tests/config.db.travis.pgsql.ini rename to tests/config.db.ci.pgsql.ini index 79c3352..3947b3a 100644 --- a/tests/config.db.travis.pgsql.ini +++ b/tests/config.db.ci.pgsql.ini @@ -3,4 +3,4 @@ host=127.0.0.1 user=postgres pass= database=tipsy -driver=postgres +driver=pgsql diff --git a/tests/config.db.local.mysql.ini b/tests/config.db.local.mysql.ini index 82da888..3336c85 100644 --- a/tests/config.db.local.mysql.ini +++ b/tests/config.db.local.mysql.ini @@ -3,3 +3,4 @@ host=127.0.0.1 user=root pass=root database=tipsy +driver=mysql diff --git a/tests/config.db.local.pgsql.ini b/tests/config.db.local.pgsql.ini index ad1f6ae..7a76d82 100644 --- a/tests/config.db.local.pgsql.ini +++ b/tests/config.db.local.pgsql.ini @@ -1,6 +1,6 @@ [db] -host=localhost -user= -pass= -database=arzynik +host=127.0.0.1 +user=postgres +pass=postgres +database=tipsy driver=pgsql diff --git a/tests/config.db.travis.mysql.ini b/tests/config.db.travis.mysql.ini deleted file mode 100644 index 31f96ef..0000000 --- a/tests/config.db.travis.mysql.ini +++ /dev/null @@ -1,5 +0,0 @@ -[db] -host=localhost -user=root -pass= -database=tipsy \ No newline at end of file diff --git a/tests/index.php b/tests/index.php index b9d5efb..f6cb6e1 100644 --- a/tests/index.php +++ b/tests/index.php @@ -1,6 +1,6 @@ - - - - + + - ./ - ./ + ./ - - - ../src - - ../examples - - - + + + ../src + + + ../examples + ../benchmarks + ../vendor + ../tests + + + + + + + + + + + + diff --git a/tests/web/index.php b/tests/web/index.php index 020e80d..31582d7 100644 --- a/tests/web/index.php +++ b/tests/web/index.php @@ -1,7 +1,7 @@ get('item/:id/json', function($Params, $Request) { header('Content-Type: application/json'); - echo json_encode([id => $Params->id, key => $Request->key, method => 'get']); + echo json_encode(['id' => $Params->id, 'key' => $Request->key, 'method' => 'get']); }) ->get('item/:id/plain', function($Params, $Request) { echo $Params->id.'.'.$Request->key.'.get'; }) ->post('item/:id/json', function($Params, $Request) { header('Content-Type: application/json'); - echo json_encode([id => $Params->id, key => $Request->key, method => 'post']); + echo json_encode(['id' => $Params->id, 'key' => $Request->key, 'method' => 'post']); }) ->post('item/:id/plain', function($Params, $Request) { echo $Params->id.'.'.$Request->key.'.post';