Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit 1e0824a

Browse files
committed
Merge branch 'hotfix/264'
Close #264
2 parents 60a7ccb + 8083d08 commit 1e0824a

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5-
## 3.2.1 - TBD
5+
## 3.2.1 - 2018-10-25
66

77
### Added
88

@@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file, in reverse
2222

2323
### Fixed
2424

25-
- Nothing.
25+
- [#264](https://github.com/zendframework/zend-expressive-skeleton/pull/264) removes phpstan leftovers.
2626

2727
## 3.2.0 - 2018-09-27
2828

src/ExpressiveInstaller/OptionalPackages.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,13 @@ public function removeInstallerFromDefinition() : void
397397
// Remove installer scripts
398398
unset($this->composerDefinition['scripts']['pre-update-cmd']);
399399
unset($this->composerDefinition['scripts']['pre-install-cmd']);
400+
401+
// Remove phpstan completely
402+
$this->composerDefinition['scripts']['check'] = array_diff(
403+
$this->composerDefinition['scripts']['check'],
404+
['@analyze']
405+
);
406+
unset($this->composerDefinition['scripts']['analyze']);
400407
}
401408

402409
/**

test/ExpressiveInstallerTest/RemoveInstallerTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,7 @@ public function testInstallerIsRemoved()
4949
$this->assertFalse(isset($composer['extra']['optional-packages']));
5050
$this->assertFalse(isset($composer['scripts']['pre-install-cmd']));
5151
$this->assertFalse(isset($composer['scripts']['pre-update-cmd']));
52+
$this->assertFalse(isset($composer['scripts']['check']['@analyze']));
53+
$this->assertFalse(isset($composer['scripts']['analyze']));
5254
}
5355
}

0 commit comments

Comments
 (0)