Skip to content

Commit

Permalink
Merge pull request #19 from pinpoint-apm/dev
Browse files Browse the repository at this point in the history
update to master
  • Loading branch information
eeliu authored Jan 12, 2021
2 parents e2a4f14 + 714e12a commit 89bb310
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 15 deletions.
43 changes: 43 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Build

on: [push, pull_request, workflow_dispatch]

jobs:
php7-1:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: MilesChou/composer-action/7.1@master
with:
args: install --no-interaction --no-suggest
- run:
vendor/bin/phpunit --configuration PHPUnit.xml --testsuit pinpoint --testdox

php7-2:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: MilesChou/composer-action/7.2@master
with:
args: install --no-interaction --no-suggest
- run:
vendor/bin/phpunit --configuration PHPUnit.xml --testsuit pinpoint --testdox

php7-3:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: MilesChou/composer-action/7.3@master
with:
args: install --no-interaction --no-suggest
- run:
vendor/bin/phpunit --configuration PHPUnit.xml --testsuit pinpoint --testdox
php7-4:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: MilesChou/composer-action/7.4@master
with:
args: install --no-interaction --no-suggest
- run:
vendor/bin/phpunit --configuration PHPUnit.xml --testsuit pinpoint --testdox
13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

6 changes: 4 additions & 2 deletions lib/pinpoint/Common/GenProxiedClassFileHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,13 @@ public function __construct($fullFile,string $prefix,array $naming=[],array $aop

private function getRealNp($node)
{
assert($node instanceof Node\Name);
if($node instanceof Node\Name\FullyQualified) // Use directly access
{
return $node->toString();
}else{ // Use namespace suggestion
}elseif ($node instanceof Node\Expr\Variable){ //#16 support new a variable
return $node->name;
}
else{ // Use namespace suggestion
$prefixNm = $node->getFirst();
if(isset($this->suffix_use[$prefixNm])){
$prefix = $this->suffix_use[$prefixNm];
Expand Down

0 comments on commit 89bb310

Please sign in to comment.