Skip to content
This repository was archived by the owner on Aug 15, 2023. It is now read-only.

Commit 7647a8e

Browse files
author
Stefano Kowalke
committed
Merge branch 'release/1.2.1'
* release/1.2.1: Raise version number [TASK] Remove the version from composer.json [BUGFIX] Add space before bracket [BUGFIX] Fix the compare operator [BUGFIX] Adjust version number in condition [TASK] Add config for HHVM [TASK] Add HHVM as build environment on Travis-CI and allow it to fail [TASK] Migrate to container-based infrastructure on Travis-CI [TASK] Add autoload information to composer.json [BUGFIX] missing constants MAXIMUM_LINE_LENGTH added, because since 7.3.0 it's no longer part of extbase's CommandController class [TASK] raise version number [TASK] Remove leading Slash on class names [BUGFIX] class name in ObjectManager->get() mustn't start with backslash Revert "[FEATURE] ConfigurationApi" Revert "[FEATURE] implement ConfigurationApiService" Revert "[TASK] using sprintf for logger message too" [FEATURE] implement ConfigurationApiService [FEATURE] ConfigurationApi [TASK] using sprintf for logger message too Update README.md
2 parents 4be8e25 + 0188291 commit 7647a8e

9 files changed

+44
-16
lines changed

‎.travis.yml‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,31 @@
1+
sudo: false
12
language: php
23
php:
34
- 5.3
45
- 5.4
56
- 5.5
67
- 5.6
8+
- hhvm
79

810
env:
911
- DB=mysql TYPO3=coreapi/develop INTEGRATION=master COVERAGE=0
1012

13+
matrix:
14+
allow_failures:
15+
- php: hhvm
16+
1117
services:
1218
- memcached
1319
- redis-server
1420

21+
addons:
22+
apt:
23+
packages:
24+
# Get latest git version cause of travis issues (https://github.com/travis-ci/travis-ci/issues/1710)
25+
- git
26+
- parallel
27+
- tree
28+
1529
notifications:
1630
email:
1731
- [email protected]
@@ -20,17 +34,23 @@ notifications:
2034
- typo3:DHkQdCNWc6x2znPAYA5T2LXO#gsoc-coreapi
2135

2236
before_script:
23-
# Get latest git version cause of travis issues (https://github.com/travis-ci/travis-ci/issues/1710)
24-
- sudo apt-get update && sudo apt-get install git parallel tree
2537
- >
2638
if [[ "$TRAVIS_PHP_VERSION" = "5.3" || "$TRAVIS_PHP_VERSION" = "5.4" ]]; then
2739
echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
2840
echo "apc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
2941
echo "apc.slam_defense=0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
3042
pecl install igbinary > /dev/null;
3143
fi
32-
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
33-
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
44+
- >
45+
if [[ "$TRAVIS_PHP_VERSION" = "5.5" || "$TRAVIS_PHP_VERSION" = "5.6" ]]; then
46+
echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
47+
echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
48+
fi
49+
- >
50+
if [[ "$TRAVIS_PHP_VERSION" = "hhv*" ]]; then
51+
echo "extension = memcache.so" >> /etc/hhvm/php.ini;
52+
echo "extension = redis.so" >> /etc/hhvm/php.ini;
53+
fi
3454
- cd ..
3555
- git clone --single-branch --branch $INTEGRATION --depth 1 git://github.com/TYPO3-coreapi/TYPO3-Travis-Integration.git build-environment
3656
- source build-environment/install-helper.sh

‎Classes/Command/BackendApiCommandController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
5656
* Initialize the object
5757
*/
5858
public function initializeObject() {
59-
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
59+
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
6060
}
6161

6262
/**

‎Classes/Command/CacheApiCommandController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
5757
* Initialize the object
5858
*/
5959
public function initializeObject() {
60-
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
60+
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
6161
}
6262

6363
/**

‎Classes/Command/DatabaseApiCommandController.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
5858
* Initialize the object
5959
*/
6060
public function initializeObject() {
61-
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
61+
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
6262
}
6363

6464
/**

‎Classes/Command/ExtensionApiCommandController.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
*/
3939
class ExtensionApiCommandController extends CommandController {
4040

41+
const MAXIMUM_LINE_LENGTH = 79;
42+
4143
/**
4244
* @var \TYPO3\CMS\Core\Log\LogManager $logManager
4345
*/
@@ -61,7 +63,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
6163
* Initialize the object
6264
*/
6365
public function initializeObject() {
64-
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
66+
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
6567
}
6668

6769
/**

‎Classes/Command/SiteApiCommandController.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
*/
3737
class SiteApiCommandController extends CommandController {
3838

39+
const MAXIMUM_LINE_LENGTH = 79;
40+
3941
/**
4042
* @var \TYPO3\CMS\Core\Log\LogManager $logManager
4143
*/
@@ -59,7 +61,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
5961
* Initialize the object
6062
*/
6163
public function initializeObject() {
62-
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
64+
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
6365
}
6466

6567
/**

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Checkout the project website at forge.typo3.org:
2323
* fetch an extension from TER
2424
* import an extension
2525
* install / uninstall extension
26-
* create upload folders
26+
* ~~create upload folders~~
2727
* configure extension
2828
* SiteApi
2929
* info

‎composer.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
"name": "etobi/coreapi",
33
"description": "Provides a simple to use API for common core features. Goal is to be able to do the most common tasks by CLI instead of doing it in the backend/browser.",
44
"type": "typo3-cms-extension",
5-
"version": "1.1.1",
65
"keywords": ["typo3", "extension", "deployment", "commandline", "cli"],
76
"authors": [
87
{
@@ -13,5 +12,10 @@
1312
"name": "Stefano Kowalke"
1413
}
1514
],
15+
"autoload": {
16+
"psr-4": {
17+
"Etobi\\CoreAPI\\": "Classes"
18+
}
19+
},
1620
"minimum-stability": "dev"
17-
}
21+
}

‎ext_emconf.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
'modify_tables' => '',
1818
'clearCacheOnLoad' => 0,
1919
'lockType' => '',
20-
'version' => '1.1.1',
20+
'version' => '1.2.1',
2121
'constraints' => array(
2222
'depends' => array(
23-
'typo3' => '6.2.0-6.2.99',
24-
'extbase' => '6.2.0-6.2.99',
25-
'fluid' => '6.2.0-6.2.99',
23+
'typo3' => '6.2.0-7.99.99',
24+
'extbase' => '6.2.0-7.99.99',
25+
'fluid' => '6.2.0-7.99.99',
2626
),
2727
'conflicts' => array(
2828
),

0 commit comments

Comments
 (0)