Skip to content

Commit

Permalink
Merge branch '3.x'
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
jamielsharief committed Feb 24, 2021
2 parents 8adde90 + c88e63a commit 6c640b9
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 7 deletions.
28 changes: 24 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## [3.7.1] - 2021-02-24

### Fixed

- Fixed task template

## [3.7.0] - 2021-02-23

### Added

- Added Task generator

## [3.6.0] - 2021-01-14

### Fixed
Expand Down Expand Up @@ -77,15 +89,15 @@

## [3.1.0] - 2020-07-13

### Added
### Added

- Added Fixture generator

## [3.0.1] - 2020-07-09

### Fixed

- Fixed bootstrap path
- Fixed bootstrap path
- Fixed incorrect db driver in travis settings

## [3.0.0] - 2020-07-08
Expand All @@ -101,29 +113,37 @@
- skipping this version to bring in line with framework version number

### Removed

- Removed docblock property tags for components from scaffolding as this is in ApplicationController

## [1.1.1] - 2020-01-28
### Fixed

### Fixed

- Fixed scaffolding templates not echoing variable

### Changed

- Changed travis.yml - Changed PHP 7.4 version and removed Removed Codecov.io

## [1.1.0] - 2019-11-28

### Fixed

- Fixed Migration version numbering to use 24 hour time

### Added

- Added Mailbox generator

## [1.0.1] - 2019-11-06

### Fixed

- concern_controller test generator (namespace)
- middleware test generator (namespace)
- model test generator (doc property comment)

## [1.0.0] - 2019-10-16

This component has been decoupled from the [OriginPHP framework](https://www.originphp.com/).
This component has been decoupled from the [OriginPHP framework](https://www.originphp.com/).
4 changes: 2 additions & 2 deletions templates/generator/task.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace %namespace%\Task;
use Origin\Schedule\Task;
use Origin\Schedule\Schedule;

class BackupTask extends Task
class %class%Task extends Task
{
protected $name = '%custom%';
protected $description = '';
Expand All @@ -23,4 +23,4 @@ class BackupTask extends Task
protected function shutdown(): void
{
}
}
}
2 changes: 1 addition & 1 deletion tests/TestCase/Console/Command/GenerateCommandTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ public function testGenerateTask()
$this->assertOutputContains('src/Task/DummyTask.php');
$this->assertFileExists($filename);

$this->assertFileHash('d7c26db6ab2efa5134e642cc71455812', $filename);
$this->assertFileHash('e5abd12b2e1377af37b17513131169ef', $filename);
unlink($filename);

$filename = TESTS . DS . 'TestCase' . DS . 'Task' . DS . 'DummyTaskTest.php';
Expand Down

0 comments on commit 6c640b9

Please sign in to comment.