Merge branch 'master' into custom-visitor

Author: johnbillion

.gitignore

@@ -1,35 +1,6 @@
-# Composer dependencies.
+/composer.lock
 /vendor/
 
-# VSCode stuff (ignore everything but these config files).
-/.vscode/
-!/.vscode/tasks.json
-!/.vscode/launch.json
-!/.vscode/cSpell.json
-!/.vscode/settings.json
-!/.vscode/extensions.json
-
-# PHP CS Fixer cache file
+# Cache files
 .php_cs.cache
-
-
-# General rules from gitignore templates.
-~*
-._*
-Icon
-*.log
-.apdisk
-.Trashes
-.AppleDB
-.DS_Store
-.fseventsd
-.LSOverride
-.AppleDouble
-.AppleDesktop
-Temporary Items
-.Spotlight-V100
-.TemporaryItems
-.VolumeIcon.icns
-Network Trash Folder
-.DocumentRevisions-V100
-.com.apple.timemachine.donotpresent
+.phpunit.result.cache

.travis.yml

@@ -1,16 +1,24 @@
-language: php
+# TravisCI configuration for php-stubs/generator
+
+language: "php"
+os:
+  - "linux"
+dist: "bionic"
 
 php:
-  - '7.1'
-  - '7.2'
-  - nightly
+  - "7.3"
+  - "7.4"
+  - "8.0"
+
+cache:
+  directories:
+    - "${HOME}/.composer/cache"
 
-matrix:
-  allow_failures:
-    - php: nightly
+before_install:
+  - "composer validate --strict"
 
-install: composer install
+install:
+  - "composer update"
 
 script:
-  - vendor/bin/phpunit
-  - vendor/bin/psalm
+  - "vendor/bin/phpunit --verbose"

README.md

@@ -1,8 +1,8 @@
 # PHP Stubs Generator
 
-[![Build Status](https://travis-ci.org/GiacoCorsiglia/php-stubs-generator.svg?branch=master)](https://travis-ci.org/GiacoCorsiglia/php-stubs-generator)
+[![Build Status](https://travis-ci.com/php-stubs/generator.svg?branch=master)](https://travis-ci.com/github/php-stubs/generator)
 
-Use this tool to generate stub declarations for functions, classes, interfaces, and global variables defined in any PHP code.  The stubs can subsequently be used to facilitate IDE completion or static analysis via [Psalm](https://getpsalm.org) or potentially other tools.  Stub generation is particularly useful for code which mixes definitions with side-effects.
+Use this tool to generate stub declarations for functions, classes, interfaces, and global variables defined in any PHP code. The stubs can subsequently be used to facilitate IDE completion or static analysis via [Psalm](https://getpsalm.org) or potentially other tools.  Stub generation is particularly useful for code which mixes definitions with side-effects.
 
 The generator is based on nikic's [PHP-Parser](https://github.com/nikic/PHP-Parser), and the code also relies on several [Symfony](https://symfony.com) components.
 
@@ -75,7 +75,7 @@ namespace MyNamespace {
 To install:
 
 ```
-composer global require giacocorsiglia/stubs-generator
+composer global require php-stubs/generator
 ```
 
 To get the pretty-printed stubs for all the PHP files in a directory:
@@ -103,7 +103,7 @@ generate-stubs --help
 To install:
 
 ```
-composer require giacocorsiglia/stubs-generator
+composer require php-stubs/generator
 ```
 
 ### Simple Example
@@ -155,11 +155,10 @@ The set of symbol types are:
 - `StubsGenerator::DOCUMENTED_GLOBALS`: Global variables, but only those with a doc comment.
 - `StubsGenerator::UNDOCUMENTED_GLOBALS`: Global variable, but only those without a doc comment.
 - `StubsGenerator::GLOBALS`: Shortcut to include both documented and undocumented global variables.
+- `StubsGenerator::CONSTANTS`: Constant declarations.
 - `StubsGenerator::DEFAULT`: Shortcut to include everything _except_ undocumented global variables.
 - `StubsGenerator::ALL`: Shortcut to include everything.
 
 ## TODO
 
-- Add support for constants declared with `const`.
-- Add support for constants declared with `define()`.
-    - Consider parsing function and method bodies for these declarations.
+- Consider parsing function and method bodies for constant declarations.

composer.json

@@ -1,13 +1,13 @@
 {
-    "name": "giacocorsiglia/stubs-generator",
+    "name": "php-stubs/generator",
     "description": "Generate stubs from any PHP code for IDE completion and static analysis.",
     "type": "library",
     "license": "MIT",
     "keywords": [
         "IDE",
         "static analysis"
     ],
-    "homepage": "https://github.com/GiacoCorsiglia/php-stubs-generator",
+    "homepage": "https://github.com/php-stubs/generator",
     "authors": [
         {
             "name": "Giaco Corsiglia",
@@ -16,23 +16,22 @@
     ],
     "autoload": {
         "psr-4": {
-            "StubsGenerator\\": "src"
+            "StubsGenerator\\": "src/"
         }
     },
     "bin": [
         "bin/generate-stubs"
     ],
     "require": {
-        "php": ">=7.1",
-        "symfony/console": "^4.0",
-        "nikic/php-parser": "^3.1",
-        "symfony/finder": "^4.0",
-        "symfony/filesystem": "^4.0"
+        "php": "^7.3 || ^8.0",
+        "nikic/php-parser": "^4.10",
+        "symfony/console": "^5.1",
+        "symfony/filesystem": "^5.0",
+        "symfony/finder": "^5.0"
     },
     "require-dev": {
-        "vimeo/psalm": "^0.3.92",
-        "phpunit/phpunit": "^7.0",
-        "friendsofphp/php-cs-fixer": "^2.10"
-    },
-    "minimum-stability": "stable"
+        "vimeo/psalm": "^4.1",
+        "phpunit/phpunit": "^9.4",
+        "friendsofphp/php-cs-fixer": "^2.16"
+    }
 }