Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update symfony lib #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 7 additions & 2 deletions config/ProjectConfiguration.class.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
<?php

//require_once '/usr/share/php/symfony/autoload/sfCoreAutoload.class.php';
require_once dirname(__FILE__) . '/../lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php';
require_once dirname(__FILE__) . '/../lib/vendor/autoload.php';
sfCoreAutoload::register();

class ProjectConfiguration extends sfProjectConfiguration
{
public function setup()
{
$webDir = sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR.'web';
sfConfig::add(array(
'sf_web_dir' => $webDir,
'sf_upload_dir' => $webDir.DIRECTORY_SEPARATOR.'uploads',
'sf_language_dir' => $webDir.DIRECTORY_SEPARATOR.'language_files',
));
$this->enablePlugins('sfDoctrinePlugin');
}
}
2 changes: 1 addition & 1 deletion config/databases-sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ all:
doctrine:
class: sfDoctrineDatabase
param:
dsn: mysql:host=<host-name>;dbname=<db-name>
dsn: 'mysql:host=<host-name>;dbname=<db-name>;charset=utf8mb4'
username: <username>
password: <password>
test:
Expand Down
14 changes: 7 additions & 7 deletions data/localizit.sql
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `ohrm_group` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`name` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=8 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=8 ;

--
-- Dumping data for table `ohrm_group`
Expand Down Expand Up @@ -57,7 +57,7 @@ CREATE TABLE IF NOT EXISTS `ohrm_language` (
`name` varchar(255) DEFAULT NULL,
`code` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=3 ;

--
-- Dumping data for table `ohrm_language`
Expand Down Expand Up @@ -107,7 +107,7 @@ CREATE TABLE IF NOT EXISTS `ohrm_source` (
`note` text,
PRIMARY KEY (`id`),
KEY `group_id_idx` (`group_id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;

--
-- Dumping data for table `ohrm_source`
Expand All @@ -129,7 +129,7 @@ CREATE TABLE IF NOT EXISTS `ohrm_target` (
PRIMARY KEY (`id`),
KEY `source_id_idx` (`source_id`),
KEY `language_id_idx` (`language_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1 ;

--
-- Dumping data for table `ohrm_target`
Expand All @@ -152,7 +152,7 @@ CREATE TABLE IF NOT EXISTS `ohrm_user` (
`password` varchar(250) DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `user_type_id_idx` (`user_type_id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=4 ;

--
-- Dumping data for table `ohrm_user`
Expand All @@ -175,7 +175,7 @@ CREATE TABLE IF NOT EXISTS `ohrm_user_language` (
PRIMARY KEY (`id`),
KEY `language_id_idx` (`language_id`),
KEY `user_id_idx` (`user_id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;

--
-- Dumping data for table `ohrm_user_language`
Expand All @@ -192,7 +192,7 @@ CREATE TABLE IF NOT EXISTS `ohrm_user_type` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`user_type` varchar(25) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=3 ;

--
-- Dumping data for table `ohrm_user_type`
Expand Down
29 changes: 29 additions & 0 deletions lib/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{

"name": "orangehrm/orange-localizit",
"keywords": ["orangehrm"],
"type": "project",
"repositories": [
{
"type": "vcs",
"url": "https://github.com/orangehrm/symfony1"
},
{
"type": "vcs",
"url": "https://github.com/orangehrm/doctrine1"
}
],
"config": {
"vendor-dir": "vendor"
},
"require": {
"lexpress/symfony1": "dev-ohrm",
"lexpress/doctrine1": "dev-master"
},
"extra": {
"installer-types": ["library"],
"installer-paths": {
"vendor/symfony/": ["lexpress/symfony1"]
}
}
}
Loading