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

Commit

Permalink
Merge branch 'release/1.2.1'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Stefano Kowalke committed Nov 15, 2015
2 parents 4be8e25 + 0188291 commit 7647a8e
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 16 deletions.
28 changes: 24 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
sudo: false
language: php
php:
- 5.3
- 5.4
- 5.5
- 5.6
- hhvm

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

matrix:
allow_failures:
- php: hhvm

services:
- memcached
- redis-server

addons:
apt:
packages:
# Get latest git version cause of travis issues (https://github.com/travis-ci/travis-ci/issues/1710)
- git
- parallel
- tree

notifications:
email:
- [email protected]
Expand All @@ -20,17 +34,23 @@ notifications:
- typo3:DHkQdCNWc6x2znPAYA5T2LXO#gsoc-coreapi

before_script:
# Get latest git version cause of travis issues (https://github.com/travis-ci/travis-ci/issues/1710)
- sudo apt-get update && sudo apt-get install git parallel tree
- >
if [[ "$TRAVIS_PHP_VERSION" = "5.3" || "$TRAVIS_PHP_VERSION" = "5.4" ]]; then
echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
echo "apc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
echo "apc.slam_defense=0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
pecl install igbinary > /dev/null;
fi
- echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
- >
if [[ "$TRAVIS_PHP_VERSION" = "5.5" || "$TRAVIS_PHP_VERSION" = "5.6" ]]; then
echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini;
fi
- >
if [[ "$TRAVIS_PHP_VERSION" = "hhv*" ]]; then
echo "extension = memcache.so" >> /etc/hhvm/php.ini;
echo "extension = redis.so" >> /etc/hhvm/php.ini;
fi
- cd ..
- git clone --single-branch --branch $INTEGRATION --depth 1 git://github.com/TYPO3-coreapi/TYPO3-Travis-Integration.git build-environment
- source build-environment/install-helper.sh
Expand Down
2 changes: 1 addition & 1 deletion Classes/Command/BackendApiCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
* Initialize the object
*/
public function initializeObject() {
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Classes/Command/CacheApiCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
* Initialize the object
*/
public function initializeObject() {
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion Classes/Command/DatabaseApiCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
* Initialize the object
*/
public function initializeObject() {
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
}

/**
Expand Down
4 changes: 3 additions & 1 deletion Classes/Command/ExtensionApiCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
*/
class ExtensionApiCommandController extends CommandController {

const MAXIMUM_LINE_LENGTH = 79;

/**
* @var \TYPO3\CMS\Core\Log\LogManager $logManager
*/
Expand All @@ -61,7 +63,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
* Initialize the object
*/
public function initializeObject() {
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
}

/**
Expand Down
4 changes: 3 additions & 1 deletion Classes/Command/SiteApiCommandController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
*/
class SiteApiCommandController extends CommandController {

const MAXIMUM_LINE_LENGTH = 79;

/**
* @var \TYPO3\CMS\Core\Log\LogManager $logManager
*/
Expand All @@ -59,7 +61,7 @@ public function injectLogManager(\TYPO3\CMS\Core\Log\LogManager $logManager) {
* Initialize the object
*/
public function initializeObject() {
$this->logger = $this->objectManager->get('\TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
$this->logger = $this->objectManager->get('TYPO3\CMS\Core\Log\LogManager')->getLogger(__CLASS__);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Checkout the project website at forge.typo3.org:
* fetch an extension from TER
* import an extension
* install / uninstall extension
* create upload folders
* ~~create upload folders~~
* configure extension
* SiteApi
* info
Expand Down
8 changes: 6 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "etobi/coreapi",
"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.",
"type": "typo3-cms-extension",
"version": "1.1.1",
"keywords": ["typo3", "extension", "deployment", "commandline", "cli"],
"authors": [
{
Expand All @@ -13,5 +12,10 @@
"name": "Stefano Kowalke"
}
],
"autoload": {
"psr-4": {
"Etobi\\CoreAPI\\": "Classes"
}
},
"minimum-stability": "dev"
}
}
8 changes: 4 additions & 4 deletions ext_emconf.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
'modify_tables' => '',
'clearCacheOnLoad' => 0,
'lockType' => '',
'version' => '1.1.1',
'version' => '1.2.1',
'constraints' => array(
'depends' => array(
'typo3' => '6.2.0-6.2.99',
'extbase' => '6.2.0-6.2.99',
'fluid' => '6.2.0-6.2.99',
'typo3' => '6.2.0-7.99.99',
'extbase' => '6.2.0-7.99.99',
'fluid' => '6.2.0-7.99.99',
),
'conflicts' => array(
),
Expand Down

0 comments on commit 7647a8e

Please sign in to comment.