Skip to content

Commit 40d9c5f

Browse files
authored
Merge pull request #6 from kdambekalns/master
!!! FEATURE: Adjust to Neos 3.0
2 parents 83d2612 + cac7dbf commit 40d9c5f

File tree

5 files changed

+55
-18
lines changed

5 files changed

+55
-18
lines changed

Classes/RobertLemke/Akismet/Exception/ConnectionException.php renamed to Classes/Exception/ConnectionException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/**
1515
* A connection exception
1616
*/
17-
class ConnectionException extends \TYPO3\Flow\Exception
17+
class ConnectionException extends \Neos\Flow\Exception
1818
{
1919

2020
}
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
* source code.
1212
*/
1313

14-
use TYPO3\Flow\Annotations as Flow;
15-
use TYPO3\Flow\Http\Request;
16-
use TYPO3\Flow\Http\Response;
17-
use TYPO3\Flow\Http\Uri;
18-
use TYPO3\Flow\Object\DependencyInjection\DependencyProxy;
14+
use Neos\Flow\Annotations as Flow;
15+
use Neos\Flow\Http\Request;
16+
use Neos\Flow\Http\Response;
17+
use Neos\Flow\Http\Uri;
18+
use Neos\Flow\ObjectManagement\DependencyInjection\DependencyProxy;
1919

2020
/**
2121
* An Akismet service wrapper class for Flow
@@ -29,19 +29,19 @@ class Service
2929

3030
/**
3131
* @Flow\Inject
32-
* @var \TYPO3\Flow\Http\Client\Browser
32+
* @var \Neos\Flow\Http\Client\Browser
3333
*/
3434
protected $browser;
3535

3636
/**
3737
* @Flow\Inject
38-
* @var \TYPO3\Flow\Http\Client\RequestEngineInterface
38+
* @var \Neos\Flow\Http\Client\RequestEngineInterface
3939
*/
4040
protected $browserRequestEngine;
4141

4242
/**
4343
* @Flow\Inject
44-
* @var \TYPO3\Flow\Log\SystemLoggerInterface
44+
* @var \Neos\Flow\Log\SystemLoggerInterface
4545
*/
4646
protected $systemLogger;
4747

Configuration/Objects.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
RobertLemke\Akismet\Service:
22
properties:
33
browserRequestEngine:
4-
object: 'TYPO3\Flow\Http\Client\CurlEngine'
4+
object: 'Neos\Flow\Http\Client\CurlEngine'

Tests/Functional/ServiceTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
*/
1313

1414
use RobertLemke\Akismet\Service;
15-
use TYPO3\Flow\Http\Request;
16-
use TYPO3\Flow\Http\Uri;
15+
use Neos\Flow\Http\Request;
16+
use Neos\Flow\Http\Uri;
1717

1818
/**
1919
* Functional tests for the Akismet Service
2020
*/
21-
class Servicetest extends \TYPO3\Flow\Tests\FunctionalTestCase
21+
class Servicetest extends \Neos\Flow\Tests\FunctionalTestCase
2222
{
2323

2424
/**

composer.json

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "robertlemke/akismet",
3-
"type": "typo3-flow-plugin",
3+
"type": "neos-package",
44
"description": "Integration of Akismet, an intelligent comment spam detector, for Flow",
55
"license": "MIT",
66
"authors": [
@@ -12,14 +12,17 @@
1212
}
1313
],
1414
"require": {
15-
"typo3/flow": "~2.0|~3.0"
15+
"neos/flow": "~4.0"
1616
},
1717
"autoload": {
18-
"psr-0": {
19-
"RobertLemke\\Akismet": "Classes"
18+
"psr-4": {
19+
"RobertLemke\\Akismet\\": "Classes"
2020
}
2121
},
2222
"extra": {
23+
"branch-alias": {
24+
"dev-master": "2.0.x-dev"
25+
},
2326
"applied-flow-migrations": [
2427
"TYPO3.Flow-201209251426",
2528
"TYPO3.FLOW3-201209201112",
@@ -47,7 +50,41 @@
4750
"TYPO3.Neos-20141218134700",
4851
"TYPO3.Fluid-20150214130800",
4952
"TYPO3.Neos-20150303231600",
50-
"TYPO3.TYPO3CR-20150510103823"
53+
"TYPO3.TYPO3CR-20150510103823",
54+
"TYPO3.Flow-20151113161300",
55+
"TYPO3.Flow-20161115140400",
56+
"TYPO3.Flow-20161115140430",
57+
"Neos.Flow-20161124204700",
58+
"Neos.Flow-20161124204701",
59+
"Neos.Twitter.Bootstrap-20161124204912",
60+
"Neos.Flow-20161124224015",
61+
"Neos.Party-20161124225257",
62+
"Neos.Eel-20161124230101",
63+
"Neos.Setup-20161124230842",
64+
"Neos.Imagine-20161124231742",
65+
"Neos.Media-20161124233100",
66+
"Neos.NodeTypes-20161125002300",
67+
"Neos.Neos-20161125002322",
68+
"Neos.ContentRepository-20161125012000",
69+
"Neos.Fusion-20161125013710",
70+
"Neos.Setup-20161125014759",
71+
"Neos.Fusion-20161125104701",
72+
"Neos.NodeTypes-20161125104800",
73+
"Neos.Neos-20161125104802",
74+
"Neos.Neos-20161125122412",
75+
"Neos.Flow-20161125124112",
76+
"Neos.SwiftMailer-20161130105617",
77+
"TYPO3.FluidAdaptor-20161130112935",
78+
"Neos.Fusion-20161201202543",
79+
"Neos.Neos-20161201222211",
80+
"Neos.Fusion-20161202215034",
81+
"Neos.Fusion-20161219092345",
82+
"Neos.ContentRepository-20161219093512",
83+
"Neos.Media-20161219094126",
84+
"Neos.Neos-20161219094403",
85+
"Neos.Neos-20161219122512",
86+
"Neos.Fusion-20161219130100",
87+
"Neos.Neos-20161220163741"
5188
]
5289
}
5390
}

0 commit comments

Comments
 (0)