Skip to content

Commit

Permalink
fix error in package name
Browse files Browse the repository at this point in the history
  • Loading branch information
zluiten committed Apr 30, 2016
1 parent 80e7b80 commit c9039bb
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 34 deletions.
13 changes: 5 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,15 @@ language: php

php:
- 5.5
- 5.6
- 7

before_script:
- cd ..
- git clone git://github.com/zendframework/ZendSkeletonApplication.git
- cd ZendSkeletonApplication
- git checkout -b br-release-2.3.3 release-2.3.3
- cp ../DOMPDFModule/.travis/composer.json ./
- curl -s http://getcomposer.org/installer | php
- php composer.phar install
- rm -rf vendor/netiul/dompdf-module/*
- cp -r ../DOMPDFModule vendor/netiul/dompdf-module
- php composer.phar require zendframework/zendframework:^2.5 netiul/dompdf-module:dev-master
- cp ../.travis/application.config.php config/application.config.php

script:
- cd vendor/netiul/dompdf-module/tests
- ../../../bin/phpunit
- vendor/bin/phpunit --configuration vendor/netiul/dompdf-module/tests/phpunit.xml vendor/netiul/dompdf-module/tests
8 changes: 0 additions & 8 deletions .travis/composer.json

This file was deleted.

17 changes: 12 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
{
"name": "netiul/dompdf-module",
"type": "library",
"description": "A Zend Framework 2 module for incorporating DOMPDF support.",
"description": "A Zend Framework 2 module for incorporating DOMPDF support - Originally by Raymond Kolbe",
"keywords": ["pdf","dompdf", "zf2"],
"homepage": "http://raymondkolbe.com",
"license": "MIT",
"authors": [
{
"name": "Zacharias Luiten",
"email": "[email protected]"
},
{
"name": "Raymond Kolbe",
"email": "[email protected]"
}
],
"replace" : {
"dino/dompdf-module": "0.*"
},
"require": {
"php": "^5.5.0",
"php": "^5.5.0 || ^7.0",
"dompdf/dompdf": "^0.6",
"zendframework/zend-eventmanager": "^2.3",
"zendframework/zend-servicemanager": "^2.3",
Expand All @@ -25,8 +31,9 @@
"zendframework/zend-modulemanager": "^2.5"
},
"autoload": {
"psr-0": {
"DOMPDFModule": "src/"
"psr-4": {
"DOMPDFModule\\": "src/DOMPDFModule",
"DOMPDFModuleTest\\": "tests/DOMPDFModuleTest"
}
}
}
16 changes: 3 additions & 13 deletions tests/Bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@
chdir(__DIR__);

$previousDir = '.';
while (!file_exists('config/application.config.php')) {
while (!file_exists('vendor/autoload.php')) {
$dir = dirname(getcwd());
if ($previousDir === $dir) {
throw new RuntimeException(
'Unable to locate "config/application.config.php": ' .
'is DOMPDFModule in a subdir of your application skeleton?'
'Unable to locate "vendor/autoload.php"'
);
}
$previousDir = $dir;
Expand All @@ -31,20 +30,11 @@
// Assumes PHP Composer autoloader w/compiled classmaps, etc.
require_once 'vendor/autoload.php';

// This namespace is not in classmap.
$loader = new StandardAutoloader(
array(
StandardAutoloader::LOAD_NS => array(
'DOMPDFModuleTest' => __DIR__ . '/DOMPDFModuleTest'
),
));
$loader->register();

$serviceManager = new ServiceManager(new ServiceManagerConfig($configuration['service_manager']));
$serviceManager->setService('ApplicationConfig', $configuration);
$serviceManager->setAllowOverride(true);

$moduleManager = $serviceManager->get('ModuleManager');
$moduleManager->loadModules();

TestCase::setServiceManager($serviceManager);
TestCase::setServiceManager($serviceManager);

0 comments on commit c9039bb

Please sign in to comment.