Skip to content

Remove code duplication for 6.2 handling #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
johnbillion wants to merge 2 commits into from
Closed

Remove code duplication for 6.2 handling #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8e73d4
Remove duplication from visitor62.php.
johnbillion Apr 19, 2023
a600e64
Remove duplication from generate.sh.
johnbillion Apr 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,23 @@ if [ ! -d vendor ]; then
fi

if [ -r source/wordpress/wp-includes/Requests/Cookie/Jar.php ]; then
# Exclude globals.
"$(dirname "$0")/vendor/bin/generate-stubs" \
--force \
--finder=finder.php \
--visitor=visitor.php \
--header="$HEADER" \
--functions \
--classes \
--interfaces \
--traits \
--out="$FILE"
VISITOR=visitor.php
else
# Exclude globals.
"$(dirname "$0")/vendor/bin/generate-stubs" \
--force \
--finder=finder.php \
--visitor=visitor62.php \
--header="$HEADER" \
--functions \
--classes \
--interfaces \
--traits \
--out="$FILE"
VISITOR=visitor62.php
fi

# Exclude globals.
"$(dirname "$0")/vendor/bin/generate-stubs" \
--force \
--finder=finder.php \
--visitor="$VISITOR" \
--header="$HEADER" \
--functions \
--classes \
--interfaces \
--traits \
--out="$FILE"

# Use literal-string type for wpdb::prepare() query statement parameter.
sed -i -e 's#^.*@param string \+\$query \+Query statement.*$#&\n * @phpstan-param literal-string $query#' "$FILE"

Expand Down
7 changes: 6 additions & 1 deletion visitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,11 @@ public function format(int $level = 1): array
*/
private $functionMap = null;

/**
* @var string
*/
public $functionMapFile = __DIR__ . '/functionMap.php';

/**
* @var array<string, array<int, WordPressTag>>
*/
Expand Down Expand Up @@ -619,7 +624,7 @@ private static function getMatchingInheritedTag(Param $param, array $tags, strin
private function getAdditionalTagsFromMap(string $symbolName): array
{
if (! isset($this->functionMap)) {
$this->functionMap = require __DIR__ . '/functionMap.php';
$this->functionMap = require $this->functionMapFile;
}

if (! isset($this->functionMap[$symbolName])) {
Expand Down
Loading